commit | 5a2ab0ec0db1ea11254459ef36400912455a5ca5 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Feb 23 16:45:38 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 23 16:45:38 2022 +0000 |
tree | a1a56c813dd30715ebe9d410056d2bad772bb244 | |
parent | 87033f18f198537b3f5a99102528d2fb7ef110d2 [diff] | |
parent | d164f6f9dff92b569b797dcc66f3653b09d0634d [diff] |
Merge "Needed here to enable submitting the equivalent fix in AOSP. Generalize keystorekey for non odsign use cases" into stage-aosp-master am: d164f6f9df Original change: https://googleplex-android-review.googlesource.com/c/platform/system/security/+/16979534 Change-Id: I4d53bae7b72d12b40b2c5ca23b224b17d4fdb844