Mark Renouf 3008a333f6 Merge "Removes unused inheritence avoidance hacks" into tm-dev am: 3ad19f7a7c ...

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

Change-Id: Ic530287adddd24d52bd8a128bacbd0f7d14a0e0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2022-03-30 21:57:49 +00:00

..

api

Merge "[CDM perm sync] Add CDM APIs for permission sync"

2022-03-30 17:22:49 +00:00

java

Merge "Removes unused inheritence avoidance hacks" into tm-dev am: 3ad19f7a7c

2022-03-30 21:57:49 +00:00

jni

Merge "Disable HDR dimming when screen rotates."

2022-03-30 16:20:50 +00:00

proto

Merge changes from topics "b124224342", "change_procstate_flag" into tm-dev am: 45081ab6a0

2022-03-29 22:11:51 +00:00

res

Merge "Add config_enable_iwlan_handover_policy flag to allow ignoring handover policies defined by carriers" into tm-dev am: acbe1b3995

2022-03-30 21:53:25 +00:00

sysprop

…

tests

Merge "Fix mobile radio battery consumption double counting" into sc-v2-dev am: f709e34b90 am: 9d9976b68f

2022-03-29 20:54:57 +00:00

xsd

…

TEST_MAPPING

…