Zimuzo Ezeozue 97d70c6fd7 Merge "Accept UUID instead of String in notifyAppIo APIs" into sc-dev am: 3d28144bbd ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1733e7e3beb9f2eda06e9d42ef0f2677bf38091b

2021-03-03 16:36:18 +00:00

..

api

Merge "Accept UUID instead of String in notifyAppIo APIs" into sc-dev am: 3d28144bbd

2021-03-03 16:36:18 +00:00

java

Merge "Accept UUID instead of String in notifyAppIo APIs" into sc-dev am: 3d28144bbd

2021-03-03 16:36:18 +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 "Restore text color state list" into sc-dev am: 84988368d2

2021-03-03 16:01:38 +00:00

sysprop

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

2021-02-21 20:12:24 +00:00

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

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

2021-02-21 20:12:24 +00:00

TEST_MAPPING

…