| commit | fdb0539274ac68a37d9a16b51e721b920cc63a09 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Thu Aug 18 20:58:59 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 18 20:58:59 2016 +0000 |
| tree | c1d5c5c4f36fc12b08904c865362f9f6ace12a50 | |
| parent | 9524e8f1c31b438fd2224f4393b96964beb4aac4 [diff] | |
| parent | ae4c328f88d79bccc041ab14d691978cdf19c06f [diff] |
Merge "Ensure hold capability is removed from ImsConference if hold not supported." into nyc-mr1-dev am: e8b110c4cb am: ae4c328f88 Change-Id: If1e5dfce59b681f246e8ca20005bb905e73538d4