Ryan Mitchell 8bd9bf4f7e Merge "Use staging-public-group in framework SDK" into sc-dev am: d4f0220d29 ...

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

Change-Id: Id2b353a9d717daa7648f274d93198e7004a4a054

2021-04-01 18:47:36 +00:00

..

api

Merge "Use staging-public-group in framework SDK" into sc-dev am: d4f0220d29

2021-04-01 18:47:36 +00:00

java

Merge "Use staging-public-group in framework SDK" into sc-dev am: d4f0220d29

2021-04-01 18:47:36 +00:00

jni

Merge "Add more OWNERs for graphics team" am: cabdc4cd72 am: 7825cff234 am: ecd1e92f7f am: 0541da6a5c

2021-03-31 20:31:24 +00:00

proto

Merge "Persist user-agnostic lastTimeAnyComponentUsed in disk" into sc-dev am: bf5667bec6

2021-03-31 23:01:22 +00:00

res

Merge "Use staging-public-group in framework SDK" into sc-dev am: d4f0220d29

2021-04-01 18:47:36 +00:00

sysprop

…

tests

Merge "Adjust total consumed power to avoid double-counting" into sc-dev am: 8b5679d534

2021-04-01 17:25:27 +00:00

xsd

…

TEST_MAPPING

…