Jeff DeCew 4e9a31b73c Merge "Use SRC_ATOP instead of SRC_IN for blending the NotificationExpandButton" into sc-dev am: d14c60be51 am: 1dfc1b579b ...

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

Change-Id: I669a3703f71320fde265c1a4bbc6314d74693830

2021-07-12 20:18:26 +00:00

..

api

Merge "Bring Predicate<Intent> to IntentFilter."

2021-07-12 15:16:13 +00:00

java

Merge "Use SRC_ATOP instead of SRC_IN for blending the NotificationExpandButton" into sc-dev am: d14c60be51 am: 1dfc1b579b

2021-07-12 20:18:26 +00:00

jni

Merge "getGpuDmaBufUsageKb: Report usage in Kilobytes" into sc-dev am: 34ce365659 am: 0e4cbd2c97

2021-07-12 17:22:35 +00:00

proto

Merge "Add statsd logs for Sensor Privacy." into sc-dev am: cd40c7406f am: 1597cc133d

2021-07-08 17:54:08 +00:00

res

Import translations. DO NOT MERGE ANYWHERE

2021-07-12 10:58:56 +00:00

sysprop

…

tests

Merge "PropertyInvalidatedCache unit test"

2021-07-08 16:55:30 +00:00

xsd

…

TEST_MAPPING

…