Commit 6c286e91 authored Jan 25, 2011 by Hung-ying Tyan Committed by Android Git Automerger Jan 25, 2011

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.

parents d1083fed b86e3070

There are no changes