diff options
| author | Xin Li <delphij@google.com> | 2021-12-14 21:24:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-14 21:24:22 +0000 |
| commit | 53e7b5b60b1b0ff19675090e78d2db45ef5c5b1f (patch) | |
| tree | 0225d027d66aa2107a97870a5f3142568f28d94e /security/keymint/aidl/vts/functional/KeyMintTest.cpp | |
| parent | e41208c9b4c605d9029666bdd90b219236aebe3e (diff) | |
| parent | e40637adf04e3286500a20b493658f7e54db0c8f (diff) | |
[automerger skipped] Merge "Merge Android 12 QPR1" am: b16c246ddc -s ours am: e40637adf0 -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: Ia14144ad408b3b93619be1e354e3f74a33cac687
Diffstat (limited to 'security/keymint/aidl/vts/functional/KeyMintTest.cpp')
0 files changed, 0 insertions, 0 deletions