Jeff DeCew 03dbfe42ba Merge changes Ifbf07b27,Ic9cd89e8 into sc-dev am: 82b5194584 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I620ca394a6f8bdca20664592ac9d1e4f3284db63

2021-03-03 21:42:11 +00:00

..

api

Merge "APIs for 5G slicing"

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

java

Merge changes Ifbf07b27,Ic9cd89e8 into sc-dev am: 82b5194584

2021-03-03 21:42:11 +00:00

jni

Merge "Update mount values to be consistent with IVold.aidl" am: ddd2a13c38 am: 3fe1ba327b am: d068d394a5 am: c8532f3dee

2021-03-03 13:41:48 +00:00

proto

Merge "Remove frozen bounds of activity and task" into sc-dev

2021-03-03 13:06:56 +00:00

res

Merge changes Ifbf07b27,Ic9cd89e8 into sc-dev am: 82b5194584

2021-03-03 21:42:11 +00:00

sysprop

…

tests

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

2021-03-03 08:33:44 +00:00

xsd

…

TEST_MAPPING

…