Jeff DeCew 513dae352d Merge "Minimal change to remove development settings." into sc-dev am: 7d1ca13d41 ...

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

Change-Id: I02d4698e5aa67aeb9dce38233885fd14ee0a929d

2021-03-22 13:09:35 +00:00

..

api

Merge "Updates to API based on API council feedback." into sc-dev am: 9f15b8d17a

2021-03-22 13:05:20 +00:00

java

Merge "Minimal change to remove development settings." into sc-dev am: 7d1ca13d41

2021-03-22 13:09:35 +00:00

jni

Merge changes from topic "eEarlyWakeup_remove" into sc-dev am: 97190e25e9

2021-03-19 17:46:09 +00:00

proto

Move service/enums.proto to proto_logging am: 51cffe5260

2021-03-18 18:23:18 +00:00

res

Merge "Import translations. DO NOT MERGE ANYWHERE"

2021-03-20 04:36:23 +00:00

sysprop

…

tests

Merge "Fix and re-enable BstatsCpuTimesValidationTest" into sc-dev am: 31c3622909

2021-03-19 22:48:17 +00:00

xsd

…

TEST_MAPPING

…