commit | 8a424af1d93a13f3b330ffe39de8aa7c592fdf49 | [log] [tgz] |
---|---|---|
author | Hung-ying Tyan <tyanh@google.com> | Mon Jan 24 19:44:56 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 24 19:44:56 2011 -0800 |
tree | 610bac9610a5b882a6314e7afa717cb16d5efdf0 | |
parent | e9acc40151db2c5ec3c958c206f7c2e805709e29 [diff] | |
parent | 14b6d0620b42d1bb3a55778ba452d838a0d89223 [diff] |
am 14b6d062: Merge changes Ib70e0cf2,I0691cd70 into gingerbread * commit '14b6d0620b42d1bb3a55778ba452d838a0d89223': SipService: registers broadcast receivers on demand. SipService: release wake lock for cancelled tasks.