| commit | 6652caa6c151eff1f5cedcd38f0d32e8a5bac869 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Tue Jan 06 00:58:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 06 00:58:57 2015 +0000 |
| tree | 71f635d1d5f5a8d3943087c1fbf0e14f8cb15e7a | |
| parent | f841d59fb4a3a362d4401dd4a0f4f93f74f1d187 [diff] | |
| parent | ce53c030cdda08aaeaa49c2ea777adcdde9d8767 [diff] |
am ce53c030: am 3926e3fb: am 3e59d689: Merge "Fixing unhold in CallsManager so it does not hold child calls." into lmp-mr1-dev * commit 'ce53c030cdda08aaeaa49c2ea777adcdde9d8767': Fixing unhold in CallsManager so it does not hold child calls.