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