| commit | b8801eceaeeb358c73ca6ada41e4d55c81e1737a | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Mon Nov 10 22:02:19 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 10 22:02:19 2014 +0000 |
| tree | ec14b792a75664fb3476af9ad46e003bdce66da4 | |
| parent | 17b361c98efcad6065a5f25425a5e9202c10e81f [diff] | |
| parent | 09f1a47bea2206427e150ebb6eaaa6c9e9bb2238 [diff] |
am 79e4cc9e: Merge "Add support for >5 participants to InCall manage conference UI." into lmp-mr1-dev * commit '79e4cc9ec826f083eaf0ac068277e376d5644eac': Add support for >5 participants to InCall manage conference UI.