| commit | ca6272cf1e02255298aa39a1f405f19ea37c8c22 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jan 06 01:20:59 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 06 01:20:59 2021 +0000 |
| tree | 5281dea18f03fa0f0c197dd1c22cb19a9019d904 | |
| parent | 5f2d59fd2daa3fc33cef0c2939075c3f1d864ff3 [diff] | |
| parent | 3443d2b671bb7d8e9bd48da1ee40286bb71d73f0 [diff] |
Merge "Keystore 2.0: Android Protected Confirmation" am: 30841f177c am: 3443d2b671 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1508897 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I034d45f1afcdd07c0b12e2db7e4134b695ec5c70