| commit | 0b129de192959faea46b0f34167459fd3b5d55ea | [log] [tgz] |
|---|---|---|
| author | Ihab Awad <ihab@google.com> | Fri Sep 12 07:22:01 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 12 07:22:01 2014 +0000 |
| tree | 0b274e82d6c9c1156e364054145917e571a5a4f2 | |
| parent | 17b17e2be1710fa7541acbde8d1ccc0b980c3d09 [diff] | |
| parent | d27a3870f6a29efdd455b16261f8984ea42499e5 [diff] |
am 0bf3d66d: Merge "Change UI to represent conferenced IMS connections (1/3)" into lmp-dev * commit '0bf3d66deb849bf8eaba2ef613beaba0b96479b9': Change UI to represent conferenced IMS connections (1/3)