am 14b6d062: Merge changes Ib70e0cf2,I0691cd70 into gingerbread

* commit '14b6d0620b42d1bb3a55778ba452d838a0d89223':
  SipService: registers broadcast receivers on demand.
  SipService: release wake lock for cancelled tasks.
This commit is contained in:
Hung-ying Tyan 2011-01-29 09:31:19 -08:00 committed by Android Git Automerger
commit 55e2207ada

Diff Content Not Available