OSDN Git Service

am 6538ac8c: (-s ours) Merge "Support conference calling. (1/4) [DO NOT MERGE]" into...
authorSantos Cordon <santoscordon@google.com>
Tue, 10 Jun 2014 18:05:30 +0000 (18:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 10 Jun 2014 18:05:30 +0000 (18:05 +0000)
commit2489ac9d24dcbb0690519940e1ad9b81e2712444
tree1b42070defc0a41277e27ae37c92748dec18fc99
parentecdb5b2bf8b4e9d3ddc13f28d1a258957d841b1a
parentece0270d992d78103aa451beda29f99948037a6f
am 6538ac8c: (-s ours) Merge "Support conference calling. (1/4) [DO NOT MERGE]" into lmp-preview-dev

* commit '6538ac8c012a67215ee98208f5a668eeb5b7c483':
  Support conference calling. (1/4) [DO NOT MERGE]