| commit | 6776c214d28b05391290392aca7c5bcd1291f066 | [log] [tgz] |
|---|---|---|
| author | Pavel Grafov <pgrafov@google.com> | Thu Feb 25 16:32:14 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 25 16:32:14 2021 +0000 |
| tree | 4fc9f4e2831d6b1851094a628ec304e7b90a5151 | |
| parent | c21c413567142b50fd76f1b5ad16c8b61bcc6bdd [diff] | |
| parent | 7e74123b72b6953e3bddfb23e0aea0bca5e3ad18 [diff] |
Merge "Keystore 2.0: Add keystore engine grant string convenience functions." am: 4da629d9be am: 7e74123b72 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569501 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I57b0b1385d023db8476dd8e8978975938e1e4d04