Treehugger Robot 30f8a371b7 Merge "Revert "Revert "Keystore 2.0 SPI: Move keymint spec to security ..."" am: dd8891acbe am: 4ac4916c8d am: cf7203f5d3 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I024a2f38dfd2432ae77d6a032c27fc8389cf62dc

2020-12-12 01:07:05 +00:00

..

api

Merge "Supported IWLAN Fail Cause" am: 32e1818fb1 am: bd1ec8809f am: 3ccb112354

2020-12-12 00:53:01 +00:00

java

Merge "Revert "Revert "Keystore 2.0 SPI: Move keymint spec to security ..."" am: dd8891acbe am: 4ac4916c8d am: cf7203f5d3

2020-12-12 01:07:05 +00:00

jni

Merge "Add more OWNERS coverages" am: 32ff0144bf am: 60f676c7d6 am: 926aa8da2c

2020-12-11 17:15:02 +00:00

proto

Add dumpsys and shell cmd for sensor_privacy

2020-12-09 14:42:41 -08:00

res

Merge "Change AppSearch querier from component to package."

2020-12-11 23:03:39 +00:00

sysprop

…

tests

Merge "Rename powerstatstests to batterystatstests"

2020-12-11 23:49:51 +00:00

xsd

…

TEST_MAPPING

…