OSDN Git Service

am 14b6d062: Merge changes Ib70e0cf2,I0691cd70 into gingerbread
authorHung-ying Tyan <tyanh@google.com>
Sat, 29 Jan 2011 17:31:19 +0000 (09:31 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 29 Jan 2011 17:31:19 +0000 (09:31 -0800)
* commit '14b6d0620b42d1bb3a55778ba452d838a0d89223':
  SipService: registers broadcast receivers on demand.
  SipService: release wake lock for cancelled tasks.


Trivial merge