OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a413f94
c9af508
)
am 14b6d062: Merge changes Ib70e0cf2,I0691cd70 into gingerbread
author
Hung-ying Tyan
<tyanh@google.com>
Sat, 29 Jan 2011 17:31:19 +0000
(09:31 -0800)
committer
Android 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