| commit | 69a5de2c55b8bbee89e83b5bdba755d165574f83 | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Sat Oct 18 00:34:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Oct 18 00:34:03 2014 +0000 |
| tree | ef8fb02aed19312d48aa44f6c0c3b3ddfc19d562 | |
| parent | 92eb9461efea55d1da036fc6633ac2fe3440de63 [diff] | |
| parent | 78711e6951e7444afa0ae224194824c4dc087337 [diff] |
am ecac1fe2: am 8930b3af: am c3defe5b: Merge "Update UI based on MANAGE_CONFERENCE capability." into lmp-mr1-dev * commit 'ecac1fe2ec84afff460cbbb409e55b9590385cff': Update UI based on MANAGE_CONFERENCE capability.