diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-28 12:17:44 +0800 |
|---|---|---|
| committer | Hung-ying Tyan <tyanh@google.com> | 2010-09-28 12:17:44 +0800 |
| commit | a57afb6a6c9f4fb451535c3d6f49c3bdf4b59125 (patch) | |
| tree | f08d30ca074de4d1247bef04b806e6f14420b674 /cmds | |
| parent | 747eb00eef784f7df746e61e7e714e4e422eb6d1 (diff) | |
| parent | 2a36a778d384403cd92b1016ed5c860d3f2c3521 (diff) | |
| download | frameworks_base-a57afb6a6c9f4fb451535c3d6f49c3bdf4b59125.zip frameworks_base-a57afb6a6c9f4fb451535c3d6f49c3bdf4b59125.tar.gz frameworks_base-a57afb6a6c9f4fb451535c3d6f49c3bdf4b59125.tar.bz2 | |
resolved conflicts for merge of 2a36a778 to master
Change-Id: Ia70adeef06afddd29c827405fb5657bf9f5a29a3
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/servicemanager/service_manager.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cmds/servicemanager/service_manager.c b/cmds/servicemanager/service_manager.c index a57a72f..d380a27 100644 --- a/cmds/servicemanager/service_manager.c +++ b/cmds/servicemanager/service_manager.c @@ -42,6 +42,7 @@ static struct { { AID_RADIO, "radio.simphonebook" }, /* TODO: remove after phone services are updated: */ { AID_RADIO, "phone" }, + { AID_RADIO, "sip" }, { AID_RADIO, "isms" }, { AID_RADIO, "iphonesubinfo" }, { AID_RADIO, "simphonebook" }, |