Anton Hansson 76b9b00a37 Merge "Baseline SAM errors" into sc-dev am: ea02255542 am: 4650ed8c8a ...

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

Change-Id: Id12a74b5e3b8047edf5b2ca1b73717a097edee61

2021-06-08 09:10:50 +00:00

..

api

Merge "Baseline SAM errors" into sc-dev am: ea02255542 am: 4650ed8c8a

2021-06-08 09:10:50 +00:00

java

Merge "Deal with blur sysprop as a boolean" into sc-dev am: 0e92d34215 am: 2afcc28fb8

2021-06-08 00:03:52 +00:00

jni

Merge "Add ART members to AndroidRuntime ownership" am: c6c226327d am: 2c01e585d2 am: 39bc8dd2b2 am: 823ab9ef97

2021-06-08 06:14:59 +00:00

proto

…

res

Merge "Import translations. DO NOT MERGE ANYWHERE"

2021-06-08 06:45:20 +00:00

sysprop

…

tests

Merge "Fix OverlayConfigTest minSdkVersion" into sc-dev am: feb4aed5a8 am: 06ab21f284

2021-06-08 00:03:26 +00:00

xsd

…

TEST_MAPPING

…