commit | 6a35826a5385499299492bd9e9ba79064889a7f3 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jul 23 19:01:22 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 23 19:01:22 2021 +0000 |
tree | 8aaafd8df5e70fc13f3f36620d77baaadf62f6af | |
parent | f6731f6f2e33286cace4ae599af98ea1e00fd9f1 [diff] | |
parent | 7e9dfba159a681823700b82cea60ff03ecc0b413 [diff] |
Merge "Keystore 2.0: Fix convertStorageKeyToEphemenral" into sc-dev am: 7e9dfba159 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/security/+/15365713 Change-Id: I7b6732eea3d7601eccce176aad56f717e22f78dc