Lucas Lin 2bb70d2c0d Merge changes I06ab0f2d,I8b146aa1 am: 67ba0bc206 am: c4432db9e9 am: 5a00e3af70 am: c966de4129 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4fa2aa5703fb592e10edb9b835477e56dadd0950

2021-03-02 20:10:22 +00:00

..

api

Merge "Move QoS API classes to Connectivity" am: 32a606fe54 am: 7152a8f376 am: 045c615bb2 am: 8d09af0b70

2021-03-02 20:09:59 +00:00

java

Merge changes I06ab0f2d,I8b146aa1 am: 67ba0bc206 am: c4432db9e9 am: 5a00e3af70 am: c966de4129

2021-03-02 20:10:22 +00:00

jni

Merge "Don't use ApkAssets::GetPath for equality checks" into sc-dev am: 3381ea741e

2021-03-02 18:41:23 +00:00

proto

Merge "Allow non-resizable apps in split-screen (5/n)" into sc-dev

2021-03-01 22:33:24 +00:00

res

Merge "Add configurable strength values for Reduce Bright Colors" into sc-dev am: f6b5277ce2

2021-03-02 18:39:46 +00:00

sysprop

…

tests

Merge "Prefetching can be interrupted by other service requests." into sc-dev am: 6996380ef9

2021-03-02 18:42:00 +00:00

xsd

…

TEST_MAPPING

…