Michael Sun d051fbac00 Merge "Revert "Add more logging for wakelock stats inquiries"" am: 4f1774283c ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2b5e05921705fbb9db802dc1ddf007face99dfe2

2020-12-30 18:09:08 +00:00

..

api

Merge "Unbundle ART API from android-non-updatable"

2020-12-29 10:31:44 +00:00

java

Merge "Revert "Add more logging for wakelock stats inquiries""

2020-12-30 17:38:41 +00:00

jni

Add total GPU usage report into dumpsys meminfo output

2020-12-30 17:32:10 +00:00

proto

Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855

2020-12-02 00:38:58 -08:00

res

Import translations. DO NOT MERGE ANYWHERE

2020-12-20 14:42:35 +00:00

sysprop

Update API of sysprop_library to match current.txt

2020-10-15 10:38:48 +00:00

tests

Merge "Make a copy of libcore.util.ArraysUtils in framework"

2020-12-17 10:10:52 +00:00

xsd

Remove vts10 related configs

2020-10-05 11:04:45 -07:00

TEST_MAPPING

…