commit | edac2c611baac49e4b94efddf06733a3d0e1da94 | [log] [tgz] |
---|---|---|
author | Yorke Lee <yorkelee@google.com> | Wed Sep 17 03:41:10 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 17 03:41:10 2014 +0000 |
tree | 089be0b558627036bcb396e5803fc4af76f38876 | |
parent | 68e3e27a1e3bc9dc2df1ce89e5a23672080bf246 [diff] | |
parent | 1c4eb10cc1159d5e029f982a629c5262419fa5ce [diff] |
am 44b693a3: Merge "Add missing methods to Conference object" into lmp-dev * commit '44b693a3cdee9908223723e961a29fbfc0305163': Add missing methods to Conference object