| commit | 3bf25dd939795814ea5de310f51fe8782846b2aa | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Thu Aug 18 21:01:58 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 18 21:01:58 2016 +0000 |
| tree | 194ee417d4480540ef3d93d38596aedbc19dda64 | |
| parent | 3bc59f1031fde017761eca2d8e1dd1b354139df4 [diff] | |
| parent | fdb0539274ac68a37d9a16b51e721b920cc63a09 [diff] |
Merge "Ensure hold capability is removed from ImsConference if hold not supported." into nyc-mr1-dev am: e8b110c4cb am: ae4c328f88 am: fdb0539274 Change-Id: Id14a0d5511f7137a5f159e3a64bdd03b97dd2d5b