OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d0c10c2 a71e074)
am 8eac20ea: SIP: implement conference call
authorHung-ying Tyan <tyanh@google.com>
Wed, 18 Aug 2010 20:37:25 +0000 (13:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 18 Aug 2010 20:37:25 +0000 (13:37 -0700)
Merge commit '8eac20eacd088793547c56e14d602b28d62fb278' into gingerbread-plus-aosp

* commit '8eac20eacd088793547c56e14d602b28d62fb278':
  SIP: implement conference call


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help