diff options
author | Shawn Willden <swillden@google.com> | 2020-12-11 11:01:03 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-11 11:01:03 +0000 |
commit | 577c22a23e66db887f1d7b5cd27bfbe48bd6dd44 (patch) | |
tree | 307cea4cbbf4d470373c696bc48a203b01256bde /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | cf0c70a5dad1bde6f62d916072503b90c0de3b89 (diff) | |
parent | ce6b4c47e2bb61eae446057d25d382b23aa2eba8 (diff) |
Merge "Keystore 2.0 SPI: Move keymint spec to security namespace." am: f0c3865132 am: 50df7a46cf am: ce6b4c47e2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1521879
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I085ddcc310b6189ae313959c9a0f349404faa178
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions