commit | 633e6c0407bdb47ebb2ac8dd0962ca0fb7a9c5fa | [log] [tgz] |
---|---|---|
author | Tyler Gunn <tgunn@google.com> | Mon Jul 15 09:48:43 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jul 15 09:48:43 2019 -0700 |
tree | 18f7f461b30b7ee9515e11037c474ed8c7721923 | |
parent | fde955c6f4a3ae1c3de66763028b1824c660cf81 [diff] | |
parent | 113f8de8dd61a54297dd816c00fe6aecd8ae5646 [diff] |
[automerger skipped] Merge "Disable single party call emulation when a connection manager is in use." am: aecf341f49 -s ours am: 113f8de8dd -s ours am skip reason: change_id I05caffeb44252340013478a138c4f28415f7b3fa with SHA1 a9d5c38e02 is in history Change-Id: I99eb5eab991ee0a8b3ccb508d56d7140e4305ea3