Gavin Corkery e425b65527 Merge "Add per-file bugreporting OWNERS" am: 324a5e53a9 am: 589f728b5a am: b81e3635e3 am: f8b9d5cd0b ...

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

Change-Id: I6eb7e46effd80fdc3bb1b440b9a14bdf005f2f51

2021-05-14 16:44:24 +00:00

..

api

Merge "Make InputMethodInfo#showInInputMethodPicker public." into sc-dev

2021-05-14 16:14:00 +00:00

java

Merge "Add per-file bugreporting OWNERS" am: 324a5e53a9 am: 589f728b5a am: b81e3635e3

2021-05-14 16:36:47 +00:00

jni

Merge "Revert "Change mounting storage data and obb flag to on by default"" into sc-dev

2021-05-14 13:32:11 +00:00

proto

Add extra flags to biometrics proto for tests.

2021-05-12 18:08:20 -07:00

res

Merge "Add CAPTURE_BLACKOUT_CONTENT permission" into sc-dev am: 1b0e20108d

2021-05-14 16:30:02 +00:00

sysprop

…

tests

Merge "Add stats session end timestamp and duration to BatteryUsageStats" into sc-dev

2021-05-13 23:08:50 +00:00

xsd

…

TEST_MAPPING

…