| commit | 8180b4c4de20aec02ad209f825cc99fd9071e577 | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Sat Aug 23 00:09:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 23 00:09:05 2014 +0000 |
| tree | 9963504206adebdf39a2d1e48541ae05153b6d99 | |
| parent | 26aabaa8eebf3a29fb209f79a22fe3da08a60dce [diff] | |
| parent | 35aec58f4f58006399b22332e8c024d8b154e544 [diff] |
am ac9fc1c8: Merge "Minor string update to manage conference description." into lmp-dev * commit 'ac9fc1c8e0b2c3e4dc504395aeae5158d0f92f06': Minor string update to manage conference description.