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:
ba5a690
a71e074
)
am f6354aca: Merge "CallManager: do not deliver ring event if fg call is live." into...
author
Hung-ying Tyan
<tyanh@google.com>
Wed, 18 Aug 2010 20:37:11 +0000
(13:37 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 18 Aug 2010 20:37:11 +0000
(13:37 -0700)
Merge commit '
f6354aca3a4d0571a66747d9cdc247a1d411d660
' into gingerbread-plus-aosp
* commit '
f6354aca3a4d0571a66747d9cdc247a1d411d660
':
CallManager: do not deliver ring event if fg call is live.
Trivial merge