Neil Fuller a15a25cb0e Merge "Document a section of code" am: 7c37904142 am: 5859be6c51 am: 09eb6c1a4f ...

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

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

2022-04-05 16:29:18 +00:00

..

api

Merge "KeyStore: Surface RKP failures" am: 6c82325675

2022-04-04 10:32:11 +00:00

java

Merge "Document a section of code" am: 7c37904142 am: 5859be6c51 am: 09eb6c1a4f

2022-04-05 16:29:18 +00:00

jni

Add ScopedLocalFrame in functions that hold Java objects

2022-04-01 17:16:58 +00:00

proto

Log AppBatteryTracker to statsd atom APP_BACKGROUND_RESTRICTIONS_INFO.

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

res

Merge "Moved telephony related resource to a separate file" into tm-dev

2022-04-04 17:44:46 +00:00

sysprop

…

tests

Merge changes from topic "merge_8391262" into stage-aosp-master

2022-04-03 06:41:20 +00:00

xsd

…

TEST_MAPPING

…