OSDN Git Service

am 5cc3f468: am 6545889d: am 8aec4e6c: am 31e7715a: am 44b693a3: Merge "Add missing...
authorYorke Lee <yorkelee@google.com>
Fri, 19 Sep 2014 07:41:08 +0000 (07:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Sep 2014 07:41:08 +0000 (07:41 +0000)
commit35b3bfe40bb62186705b9f66a056b82a12d56b65
tree6449ad0b701681ec0975904007dd2b02192f2491
parent255e70278ade9ae5155bc2ce169b6dbfc61fcfdc
parent8d2b08cb46c94831ba97a02c4ee0d35655c96efb
am 5cc3f468: am 6545889d: am 8aec4e6c: am 31e7715a: am 44b693a3: Merge "Add missing methods to Conference object" into lmp-dev

* commit '5cc3f4687dd6c251c401cb27cc549fb5af95f3ed':