OSDN Git Service

am 6545889d: am 8aec4e6c: am 31e7715a: am 44b693a3: Merge "Add missing methods to...
authorYorke Lee <yorkelee@google.com>
Wed, 17 Sep 2014 15:22:23 +0000 (15:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 17 Sep 2014 15:22:23 +0000 (15:22 +0000)
commit8d2b08cb46c94831ba97a02c4ee0d35655c96efb
treea4bd044aa98d87509b481a81b6dd7b27f1b04adc
parent50a5eea9215aa594f420b2c81e0a78643e75c370
parentca18781975def9a8a18028b1713b475e644cb34d
am 6545889d: am 8aec4e6c: am 31e7715a: am 44b693a3: Merge "Add missing methods to Conference object" into lmp-dev

* commit '6545889dd97dd40403ac94a8d883ed6a68301439':
  Add missing methods to Conference object