summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorJanis Danisevskis <jdanis@google.com>2021-02-08 17:50:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-08 17:50:49 +0000
commit9741311bc4aa2c7d0b2ae3ad3853fa46ad512cd1 (patch)
tree4f66e2811a22234f09dce10834b1fa3e0330d4eb /tools/aapt2/java/JavaClassGenerator.cpp
parent5a0c28dcf674679856385ff29742183ad7c33165 (diff)
parentfccde53e0aa75aa9c3530dccd4db47f271979aea (diff)
Merge "Keystore 2.0 SPI: Add CERTIFICATE_* tags." am: 14a82f7983 am: 4b875e5524 am: fccde53e0a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566352 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1d1e8eda85dc9c415fea10a23f345d94da8b2290
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions