tree dc04fa77409a52d00fe0ca8d9157f02d5a6d3378
parent 310c197142b55276004f20187c82f67d24f997af
parent 958aa683a4fcd66c90e0661ace361686376a7003
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1554751600 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1554751600 +0000

Merge "[automerger skipped] Merge "Clean up Call redirection setting" am: 9d6ac63e5e am: d4b3f65d35 -s ours am skip reason: change_id I9cb569bfd1ef5fba7958bb2e5f42f05e300e3358 with SHA1 fa9460a6f0 is in history" into qt-dev-plus-aosp