Treehugger Robot ea70d5adc2 Merge "Add owner to codegen annotations" am: 7765329813 am: e897f5f8d6 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie4370f8059802250c5bd9112a10573effba8551e

2020-12-22 23:23:24 +00:00

..

api

Merge "Revert "Fix permission on TM#isDataEnabled""

2020-12-22 19:36:50 +00:00

java

Merge "Add owner to codegen annotations" am: 7765329813 am: e897f5f8d6

2020-12-22 23:23:24 +00:00

jni

Merge "Introduce device(s) role for strategy." am: 7f73ba815a am: c24c3af89d

2020-12-22 17:26:34 +00:00

proto

Add mediametrics enum for MediaExtractor usage

2020-12-17 12:37:42 +00:00

res

Import translations. DO NOT MERGE ANYWHERE

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

sysprop

…

tests

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

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

xsd

…

TEST_MAPPING

…