| commit | 07b5337bc113f8f6cbb82911b7e7abace1a69db9 | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Sat Aug 23 00:15:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 23 00:15:49 2014 +0000 |
| tree | 9963504206adebdf39a2d1e48541ae05153b6d99 | |
| parent | b47abd4bedac5b29a8e7000018cd6b71cf5d6e40 [diff] | |
| parent | 8180b4c4de20aec02ad209f825cc99fd9071e577 [diff] |
am b344cb8f: am ac9fc1c8: Merge "Minor string update to manage conference description." into lmp-dev * commit 'b344cb8fd9f287a2f8437a71aab1ed80b8cc65a0': Minor string update to manage conference description.