tree ef9cbeb288632a5a6ad3178bf238980f4972bfb5
parent 47fdabe9fa3e3ab8dfbd4c1f437e124f91288898
parent 2cadf8e9f9a11ebddd4d1409332fb84e9b06ceb1
author Xiangyu/Malcolm Chen <refuhoo@google.com> 1554335373 -0700
committer android-build-merger <android-build-merger@google.com> 1554335373 -0700

Merge "Clean up a few names of Telephony intent extra." am: 63bf486921
am: 2cadf8e9f9

Change-Id: I1026c87f73abc5dccee6c1b5a1747c53e436b5f0