diff options
| author | Orion Hodson <oth@google.com> | 2020-12-11 14:02:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-11 14:02:26 +0000 |
| commit | 525a22a777e3413afbeb375d8af32c644a09d8b4 (patch) | |
| tree | dde5a05700707a48c7d8d89c18a89db1f01b7d70 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 461ebde8347f936cc06b8c9b5086453a2f41d579 (diff) | |
| parent | 1de159412b6b6bcf0a4cea505f7816e480c5a1c3 (diff) | |
Merge "Revert "Keystore 2.0 SPI: Move keymint spec to security namespace."" am: bc641a41d8 am: 9e21ecbcb4 am: 1de159412b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1525805
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie45400513bc12278a68c8af1b5a12ba754f048c5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions