commit | 7b2ca23262b753182d48a894901ef54b85b2de48 | [log] [tgz] |
---|---|---|
author | Hung-ying Tyan <tyanh@google.com> | Sat Jan 29 09:31:19 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 29 09:31:19 2011 -0800 |
tree | 4e4496283c9df2af3eb7d864b069dbb57ff867e8 | |
parent | 3e18ef5ffeddda80ebf6c8daf96b5cb2b1a4dd9b [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.