Josh Gao 496317fc47 Merge changes I8b85d8ee,I789f41f1 am: ddaf564365 am: 4359428db3 am: b4d05a90e9 am: e18b895a74 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9f51c7c42ee249a66bd430f8e4c4282f718ab6f4

2021-02-05 22:09:35 +00:00

..

android

Merge "Update Java doc for ResumeOnReboot" am: 90772648cd am: bb0da56b59 am: ce39bfb3c1 am: f34eed4c93

2021-02-05 20:37:21 +00:00

com

Merge changes I8b85d8ee,I789f41f1 am: ddaf564365 am: 4359428db3 am: b4d05a90e9 am: e18b895a74

2021-02-05 22:09:35 +00:00

org

…

Android.bp

…

jarjar-rules.txt

…

overview.html

…