| commit | befb01e32cf537c6c51c77cf925fac213da50b0a | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Tue Sep 23 15:50:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 23 15:50:02 2014 +0000 |
| tree | 99906b4fa9216c5dd939b400e321d5ba1ac4b975 | |
| parent | 6cfd406e8adeae262cb4698a0766929681d041d3 [diff] | |
| parent | 5e2b486ef58457652005f7b5856deb930b52bb10 [diff] |
am 59c6b4d5: am fc85055f: am 196dd4d9: am 76473066: Merge "Update InCallUI for "generic" conference calls." into lmp-dev * commit '59c6b4d523e3f0f3f0ad67f4f62a8a22cbde7213': Update InCallUI for "generic" conference calls.