commit | fdf83fd43e382ab4d6b4c75fd883b91d19dac5ec | [log] [tgz] |
---|---|---|
author | Janis Danisevskis <jdanis@google.com> | Thu Mar 10 19:04:19 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 10 19:04:19 2022 +0000 |
tree | 87562ee0d8b47edfb944004f7c343ef690b9744e | |
parent | 9901ad5d96e4a5f2d81763041d721e1deb5426c1 [diff] | |
parent | f7c1c732c49cb914304a4635102a5804d7a42973 [diff] |
[automerger skipped] Keystore 2.0: Teach keystore to decrypt generic blobs. am: d647b4a5b3 -s ours am: f7c1c732c4 -s ours am skip reason: Merged-In Id8561d3f98d53182709d9f4feeeecda3b1535077 with SHA-1 f84d0b0520 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/security/+/16909355 Change-Id: I4c69d03e69070e71e10dabde10ae8f9b6a9f5514