| commit | 48d49a205a49de4d7e8e9d7a654b1fa2a2434d57 | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Wed Oct 15 20:52:55 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 15 20:52:55 2014 +0000 |
| tree | 58c01c9bbffb60f20a7340664db092b8e978a8bf | |
| parent | 3afc487ef5f1c8a1039a5b06b1b8538b4cb3672f [diff] | |
| parent | aec501c9c29db2ef2f2ac885da1462a5916e32b7 [diff] |
am 158eab1b: Merge "Update Conference Manager UI after capability changes." into lmp-mr1-dev * commit '158eab1b189b530fbd452ba3e506f75c0b776b82': Update Conference Manager UI after capability changes.