Lucas Dupin 48367b4db0 Merge "Don't turn on prox when wirelessly charging." into rvc-d1-dev am: 7e387342d6 am: cf0396877a am: dea89ca31c ...

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

Change-Id: I3b911b4a573e3464a11a6ff2729703121cc9a4c3

2020-07-21 01:24:45 +00:00

..

res/layout

…

src/com/android

Merge "Don't turn on prox when wirelessly charging." into rvc-d1-dev am: 7e387342d6 am: cf0396877a am: dea89ca31c

2020-07-21 01:24:45 +00:00

Android.mk

…

AndroidManifest-base.xml

…

AndroidManifest.xml

Merge "Fix component in ControlsRequestDialog" into rvc-dev am: 12927d9214 am: 4c139797af am: d180ec3eef am: f4c319c770

2020-06-27 03:14:03 +00:00

AndroidTest.xml

…