Zoey Chen 4a8217abd9 Merge changes from topic "PSL_TelephonyCallback" am: 456069019e am: 0a1acbbcd3 ...

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614981

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic26eea861f33d75b7b5ef62aa411532e52cac51b

2021-03-09 11:51:08 +00:00

..

res/layout

…

src/com/android

Merge changes from topic "PSL_TelephonyCallback" am: 456069019e am: 0a1acbbcd3

2021-03-09 11:51:08 +00:00

Android.mk

…

AndroidManifest-base.xml

…

AndroidManifest.xml

Fix component in ControlsRequestDialog

2020-06-26 14:53:09 -04:00

AndroidTest.xml

…