| commit | 5597fb76adef077cfb1a7e6f495bdfc8d60a9302 | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Wed Oct 15 21:00:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 15 21:00:20 2014 +0000 |
| tree | 49f3120dd7e031311b42556e45dcae68f07bebd9 | |
| parent | db3da76479584975ca50bfa44e116b0d135fb538 [diff] | |
| parent | 48d49a205a49de4d7e8e9d7a654b1fa2a2434d57 [diff] |
am 578d69f8: am 158eab1b: Merge "Update Conference Manager UI after capability changes." into lmp-mr1-dev * commit '578d69f88277a8b0e3b7f092bc094837fe39af3d': Update Conference Manager UI after capability changes.