Janis Danisevskis a18b2db113 Merge changes I7c17ab51,I5bd4acb4,I93270f00 am: 18bbac10c1 am: 68acc834d4 am: c04b6004a3 am: 9060b67f0f ...

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

Change-Id: Iaca7385d86f44b1c1cb8625340c8e5a6033d10c7

2020-11-02 21:28:34 +00:00

..

api

resolve merge conflicts of 887f4fbc74 to rvc-qpr-dev-plus-aosp

2020-10-30 17:02:14 +00:00

java

Merge changes I7c17ab51,I5bd4acb4,I93270f00 am: 18bbac10c1 am: 68acc834d4 am: c04b6004a3 am: 9060b67f0f

2020-11-02 21:28:34 +00:00

jni

Create cross window blur drawable

2020-11-02 04:26:13 +00:00

proto

Merge "Migrate AppStandbyController to DeviceConfig."

2020-10-29 15:25:26 +00:00

res

Merge "Import translations. DO NOT MERGE ANYWHERE"

2020-11-02 21:26:00 +00:00

sysprop

…

tests

Merge "Rename TextViewOnReceiveContentCallbackTest to TextViewOnReceiveContentTest"

2020-11-02 17:57:39 +00:00

xsd

…

TEST_MAPPING

…