diff options
author | David Zeuthen <zeuthen@google.com> | 2021-03-25 19:01:38 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-25 19:01:38 +0000 |
commit | d91def89c0389bedd26248807b4955d7495f0392 (patch) | |
tree | 7ebc091e92edeae8387c25895c2917f56daeaf3f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 301f4a5f5497596d5c33015a0768dae0c6043d87 (diff) | |
parent | a911b5da560f3991f8418731396814a22ac04a75 (diff) |
Merge "PackageManager: Add FEATURE_HARDWARE_KEYSTORE, modify FEATURE_STRONGBOX_KEYSTORE." am: b0a08c82bc am: a911b5da56
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626660
Change-Id: Iafd15441005b71103cea730967ad7f3dccc111dd
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions