From: Xiangyu/Malcolm Chen <refuhoo@google.com>
Date: Thu, 4 Apr 2019 00:13:58 +0000 (-0700)
Subject: [automerger skipped] Merge "Clean up a few names of Telephony intent extra." am:... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2fec69813c3d118585f03b32654cf3d8edb2bb1a;p=android-x86%2Fframeworks-base.git

[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
---

2fec69813c3d118585f03b32654cf3d8edb2bb1a