| commit | a32dc0fbe21b20b9333a591e1378087567236428 | [log] [tgz] |
|---|---|---|
| author | Janis Danisevskis <jdanis@google.com> | Tue Mar 23 20:09:00 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 23 20:09:00 2021 +0000 |
| tree | a65b61df5308891b35cda203ca64be04748fdea8 | |
| parent | 96972d6cf1f2df21a7c9ba8a9cde58cf4ee6ecd7 [diff] | |
| parent | 15d9a3ab428dfcf06799d077d3d5a33405baf95a [diff] |
Merge "Keystore 2.0: Add @IntDef for Keystore namespaces." am: faabd1a836 am: 15d9a3ab42 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649668 Change-Id: I2b03db7d4300d2011db7a9685aafc1091f752465