| commit | 2199092f3fc9becb56128e2448640731199b3300 | [log] [tgz] |
|---|---|---|
| author | Pavel Grafov <pgrafov@google.com> | Fri Feb 26 17:27:08 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 26 17:27:08 2021 +0000 |
| tree | c85618c92fe6d15dbdf95f29c1fd1c3297f84b93 | |
| parent | 7752848106dc773a197ed92c31c1521d41cb77cc [diff] | |
| parent | 6776c214d28b05391290392aca7c5bcd1291f066 [diff] |
Merge "Keystore 2.0: Add keystore engine grant string convenience functions." am: 4da629d9be am: 7e74123b72 am: 6776c214d2 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569501 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7f2ba849f84956b95caa9d7b32e3967bafb99c18