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