Eric Biggers 3abc52220b Merge "Stop using FDE-related constants from IVold" am: 489ba5ac07 am: 84f05b1b9c am: e1a9ca0ec8 ...

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

Change-Id: Ic411eb688afe449212dee247d2ecb39471c4314f

2022-03-22 18:04:27 +00:00

..

api

Merge "Fix wrong Nullability of BoringLayout new API introduced in API33" into tm-dev

2022-03-22 17:00:27 +00:00

java

Merge "Stop using FDE-related constants from IVold" am: 489ba5ac07 am: 84f05b1b9c am: e1a9ca0ec8

2022-03-22 18:04:27 +00:00

jni

Merge "Add setBuffer w/ release callback" into tm-dev

2022-03-19 01:32:25 +00:00

proto

Merge "Fix proto invalid write type"

2022-03-22 12:18:39 +00:00

res

Merge "Fix typos in broadcast strings for RestrictionsManager" into tm-dev

2022-03-22 17:52:58 +00:00

sysprop

…

tests

Merge "Fix BatteryStatsHistoryTest for low ram devices" into tm-dev

2022-03-22 11:10:28 +00:00

xsd

…

TEST_MAPPING

…