| commit | e74f6304ce1ffa15dc357fa6ad2da84e6f7d5b6d | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Tue Nov 11 00:34:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 11 00:34:07 2014 +0000 |
| tree | 53580aabf098457032d3e3826e74bd894bb84d9f | |
| parent | 0234f25ca03b03b1300d6e8553b15cb041105bce [diff] | |
| parent | 726f6d8dfb47ed5ce3e94bc6a85e3d0f91270219 [diff] |
am 94ada0d4: am c2fc606f: am 79e4cc9e: Merge "Add support for >5 participants to InCall manage conference UI." into lmp-mr1-dev * commit '94ada0d46586a32a3876d561d70caf3065e01699': Add support for >5 participants to InCall manage conference UI.