| commit | 844ec09adab5d44920b123196bc90f64d063c03e | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Feb 14 18:58:16 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 14 18:58:16 2022 +0000 |
| tree | ad5b88c34fd7d64ebe1e0e71e25a9c78df79a544 | |
| parent | ca257ce400efec5dc51d3019f2a0af92b2061564 [diff] | |
| parent | c2889593bc07adea3df236c71152d2cb1d42a263 [diff] |
Merge "Keystore 2.0: Teach keystore to decrypt generic blobs." am: aea5a6bea2 am: c2889593bc Original change: https://android-review.googlesource.com/c/platform/system/security/+/1973984 Change-Id: I7b2f9eb044e96f22b12c6df22f400afe87255487