Chiachang Wang dd859dc564 Merge "Update the java doc" am: b7e998e235 am: a076a5ee40 am: 9df60ac18b ...

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

Change-Id: Icf377a4cdf7ee2246286a7eb02e41040d397ea57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2022-04-11 04:01:46 +00:00

..

api

Merge SP2A.220405.004 to aosp-master - DO NOT MERGE

2022-04-07 18:40:59 -07:00

java

Merge "Update the java doc" am: b7e998e235 am: a076a5ee40 am: 9df60ac18b

2022-04-11 04:01:46 +00:00

jni

Merge "Move common JNI code out of AudioTrack" into tm-dev

2022-04-07 19:25:11 +00:00

proto

Log AppBatteryTracker to statsd atom APP_BACKGROUND_RESTRICTIONS_INFO.

2022-04-04 13:32:15 -07:00

res

Merge "Update the strings on app unavailable alert dialog" into tm-dev

2022-04-08 15:48:52 +00:00

sysprop

…

tests

Merge "Create OnBackInvokedCallbackInfo to wrap callback and its priority." into tm-dev

2022-04-08 04:07:53 +00:00

xsd

…

TEST_MAPPING

…