summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2011-01-29 09:31:19 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-29 09:31:19 -0800
commit7b2ca23262b753182d48a894901ef54b85b2de48 (patch)
tree4e4496283c9df2af3eb7d864b069dbb57ff867e8
parent3e18ef5ffeddda80ebf6c8daf96b5cb2b1a4dd9b (diff)
parent14b6d0620b42d1bb3a55778ba452d838a0d89223 (diff)
downloadframeworks_base-7b2ca23262b753182d48a894901ef54b85b2de48.zip
frameworks_base-7b2ca23262b753182d48a894901ef54b85b2de48.tar.gz
frameworks_base-7b2ca23262b753182d48a894901ef54b85b2de48.tar.bz2
am 14b6d062: Merge changes Ib70e0cf2,I0691cd70 into gingerbread
* commit '14b6d0620b42d1bb3a55778ba452d838a0d89223': SipService: registers broadcast receivers on demand. SipService: release wake lock for cancelled tasks.
0 files changed, 0 insertions, 0 deletions