| commit | 06c11d57989d34e7d67cbd785084a4b55e83a7a1 | [log] [tgz] |
|---|---|---|
| author | Nancy Chen <nancychen@google.com> | Wed Sep 10 21:54:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 10 21:54:58 2014 +0000 |
| tree | 1824da93f85e0ba6ef8b6b39d4017a350e5f6820 | |
| parent | 2e9616354c1db789e47c9dd2b38be4ecb16da556 [diff] | |
| parent | 74d99a1498480686f86b4494be41f787d06a6ea3 [diff] |
am 8f1e1f21: am 61922585: Merge "Add docs to Conference object." into lmp-dev * commit '8f1e1f21285a4590fdc236d4a0803602909a5067': Add docs to Conference object.