| commit | 15d9a3ab428dfcf06799d077d3d5a33405baf95a | [log] [tgz] |
|---|---|---|
| author | Janis Danisevskis <jdanis@google.com> | Tue Mar 23 19:50:10 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 23 19:50:10 2021 +0000 |
| tree | b69e44a560908367b1f60fd1a48e5daf08b34668 | |
| parent | 5b713194359fdb3ebc88afb6eb4609ec7d177f63 [diff] | |
| parent | faabd1a8360ced622eb15909e1aae6f4c0059c53 [diff] |
Merge "Keystore 2.0: Add @IntDef for Keystore namespaces." am: faabd1a836 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649668 Change-Id: Iec2c037edbe72ef678c49e0a2d88d04d8ca98f9d