commit | 2b6d07a51a4692cefea11035eacd257eef24f02c | [log] [tgz] |
---|---|---|
author | Hung-ying Tyan <tyanh@google.com> | Tue Jan 25 10:58:26 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 25 10:58:26 2011 -0800 |
tree | 60037cf12b8696f20f86bd7939f16a95886b944a | |
parent | 2996adb765fe34cf12744019d60b3db86fb31295 [diff] | |
parent | 8a424af1d93a13f3b330ffe39de8aa7c592fdf49 [diff] |
am 8a424af1: am 14b6d062: Merge changes Ib70e0cf2,I0691cd70 into gingerbread * commit '8a424af1d93a13f3b330ffe39de8aa7c592fdf49': SipService: registers broadcast receivers on demand. SipService: release wake lock for cancelled tasks.