| commit | 82754dcd3751af40ed4c4c8f2c08f7a6a11be418 | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Sat Oct 18 00:25:17 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Oct 18 00:25:17 2014 +0000 |
| tree | 568ef9f447f65e8872c1cc315c06d2272106ec0f | |
| parent | 3229c6e2e9f44db0f0959a09a390f96e9152755d [diff] | |
| parent | 23352c4b463759fa8b87cc29d41b579c40797311 [diff] |
am c3defe5b: Merge "Update UI based on MANAGE_CONFERENCE capability." into lmp-mr1-dev * commit 'c3defe5b62cab2f17fe58b3b6e55cf5800a8f584': Update UI based on MANAGE_CONFERENCE capability.