David Drysdale f417c062d1 Merge "KeyMint VTS: test getKeyCharacteristics()" am: 19c7c575f0 am: fdf8b5d957 ... Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1714348 Change-Id: Ia80b988f91e409835ad80e26dc5a45fdcc324b31		2021-06-03 07:45:23 +00:00
..
keymint	Merge "KeyMint VTS: test getKeyCharacteristics()" am: 19c7c575f0 am: fdf8b5d957	2021-06-03 07:45:23 +00:00
secureclock/aidl	Merge "Fix for the documentation in TimeStampToken.aidl. HMAC computation will always use 1, which is the value of SecurityLevel.TRUSTED_ENVIRONMENT. This is done for backwards compatibility purpose. Test: N/A Bug: None." am: 006bdf3fa9 am: 94131d871b	2021-06-01 20:03:06 +00:00
sharedsecret/aidl	Freeze AIDL APIs for SC	2021-05-25 10:13:26 +09:00