Kate Montgomery bc190889a6 Merge "Revert "Update show system experiment behavior."" into tm-dev am: 7c4b55cc6c am: e0d552c3e5 am: 493c2466aa ...

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

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

2022-05-04 16:29:20 +00:00

..

api

Merge "Verify INTERACT_ACROSS_USERS_FULL perm for cross-user calls." into tm-dev am: 5047c1abb4 am: 73b8912e2d

2022-05-02 22:48:58 +00:00

java

Merge "Revert "Update show system experiment behavior."" into tm-dev am: 7c4b55cc6c am: e0d552c3e5 am: 493c2466aa

2022-05-04 16:29:20 +00:00

jni

Merge "Add Frank/team as android_os_GraphicsEnvironment.cpp OWNERS" am: 6816c0d8dd am: 8e7fbde4f2

2022-05-04 04:07:04 +00:00

proto

Merge "Add "ro.hardware.egl_legacy" for ANGLE system driver" am: 13e9a8c0a2 am: abcd609251

2022-05-02 19:25:09 +00:00

res

Merge changes I6a3f56bd,Ib5f39eb1 into tm-dev am: 1999fa1097 am: 7d58f8562f am: 4d3c2b3b3e

2022-05-04 13:52:21 +00:00

sysprop

…

tests

Merge "Address proportional counting for out-of-order timestamps" into tm-dev am: 860fe90fbd am: 892520724e

2022-05-04 01:49:00 +00:00

xsd

…

TEST_MAPPING

…