| commit | 4d658aa68029acc3cd6cd2932c3f5df35294a44c | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Wed Dec 10 22:50:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 10 22:50:15 2014 +0000 |
| tree | 91d17b080526efe4ce0d03e95dacfec1c156cec5 | |
| parent | 8d626bc42886f7d080b4f423902a287c7db64f37 [diff] | |
| parent | 4d6531be32d7edcc1d2444aab19bb9afeaf47283 [diff] |
am 6bd19a57: Merge "No InCall UI visible after hiding conference manager." into lmp-mr1-dev * commit '6bd19a57611950ff85c0411b77ea5c051e7659a6': No InCall UI visible after hiding conference manager.