diff options
| author | Xin Li <delphij@google.com> | 2021-12-14 21:00:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-14 21:00:26 +0000 |
| commit | e40637adf04e3286500a20b493658f7e54db0c8f (patch) | |
| tree | 2c849b9d6bee83203e3ed632ec6ba34d7a36a0eb /security/keymint/aidl/vts/functional/KeyMintTest.cpp | |
| parent | 07069c9e3576caf17eea4af01cab3f87c8ade58f (diff) | |
| parent | b16c246ddc19cc3814f5faeb28f3372ac12a00f3 (diff) | |
[automerger skipped] Merge "Merge Android 12 QPR1" am: b16c246ddc -s ours
am skip reason: Merged-In I66e5209ddfba025f43ca0beb7067e6e0e29f9e46 with SHA-1 41aaa16fca is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1921858
Change-Id: Ifa8f95bdef29597f3e0ebc12a28c11f8736eb120
Diffstat (limited to 'security/keymint/aidl/vts/functional/KeyMintTest.cpp')
0 files changed, 0 insertions, 0 deletions