tree d10c7bae038fc564f4a57e3aead8967d8f2f90fd
parent 0c70be6738b8f242511ae622e453d8c1c6e441e5
parent 3722b6907f55dfe5cf2f3cb2cc7a5a294a92ef65
author Xiangyu/Malcolm Chen <refuhoo@google.com> 1554336838 -0700
committer android-build-merger <android-build-merger@google.com> 1554336838 -0700

[automerger skipped] Merge "Clean up a few names of Telephony intent extra." am: 63bf486921 am: 2cadf8e9f9
am: 3722b6907f -s ours
am skip reason: change_id Iaf004d6881964bd19072e9ef623f2e89f2529639 with SHA1 2e1f945a6c is in history

Change-Id: Ic1bf053d7233e1068aa3d2d5b4512e6626d9a4cf