diff options
author | Jayachandran Chinnakkannu <jayachandranc@google.com> | 2021-10-28 02:34:41 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-28 02:34:41 +0000 |
commit | 33e1f8acd0bc921351d6a410e2e153ccf95fa554 (patch) | |
tree | f9a90e82d53aea04c8f65c5c1ec483a02a0cfa80 /security/keymint/aidl/vts/functional/KeyMintTest.cpp | |
parent | 7806f5f8379bc95bc5b00ac3893135d6da919d51 (diff) | |
parent | 16a873bf0493b51c2435b0631addb4d01cc653b8 (diff) |
[automerger skipped] Merge "Do not assert CardState::PRESENT on sim power down" am: b311ffdb2a am: 43d81bfc35 am: 0bdb66adb3 am: 6c86b611ba -s ours am: 16a873bf04 -s ours
am skip reason: Merged-In I6c9cbad7cd4fd19eb0b77c55ff37298b97f32050 with SHA-1 f7069c658c is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1869544
Change-Id: I0d24367b59c415403e2188fae3944cc8e7a47ec8
Diffstat (limited to 'security/keymint/aidl/vts/functional/KeyMintTest.cpp')
0 files changed, 0 insertions, 0 deletions