Nikita Ioffe 83575fb0ce Merge "Rename partner-apex-allowlist to vendor-apex-allowlist" into sc-dev am: b3db287943 am: 1b6a8a8297 ...

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

Change-Id: I6d167fcf646d25e59036b7be947c1ed3d6e82609

2021-06-23 11:27:50 +00:00

..

api

Merge "Add constant for "app_compat_overrides" namespace" into sc-v2-dev am: 1920a823cc am: 9c85831108

2021-06-23 11:08:16 +00:00

java

Merge "Rename partner-apex-allowlist to vendor-apex-allowlist" into sc-dev am: b3db287943 am: 1b6a8a8297

2021-06-23 11:27:50 +00:00

jni

Merge "Allow app zygote preload to retain files across fork" am: f334f4ed31 am: 5465af8413 am: cdc831bac6 am: 9a44a29d3b

2021-06-23 00:29:32 +00:00

proto

Merge "Add dumpToProto to TaskFragment" into sc-v2-dev am: a8ce14e30f

2021-06-18 04:13:33 +00:00

res

Merge changes I69fb6747,I1661f4ad into sc-dev am: 277c8e1b29 am: 63528dccd9

2021-06-23 08:33:14 +00:00

sysprop

…

tests

Merge "Update framework from jetpack." into sc-dev am: 27b63bb150 am: 029a299f82

2021-06-22 21:49:18 +00:00

xsd

…

TEST_MAPPING

…