OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
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...
authorHung-ying Tyan <tyanh@google.com>
Wed, 18 Aug 2010 20:37:11 +0000 (13:37 -0700)
committerAndroid 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
frameworks/native
About OSDN
Find Software
Develop Software
Help