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.
This commit is contained in:
Hung-ying Tyan
2011-01-25 10:58:26 -08:00
committed by Android Git Automerger

Diff Content Not Available