summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-04 00:02:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-04 00:02:36 +0000
commitd22330d804ddffffa36aac4b0461ed9fb8f85cca (patch)
tree3905411e667d2ff53356e06be0d975bfd0957e9d /tools/aapt2/java/JavaClassGenerator_test.cpp
parentab5e496cb6750d2b7d1cea7eb1b18dd8a6b1737f (diff)
parentb4f374949897189d2386bc7fe59dae2dc6273820 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: e67f8a3ca0 -s ours am: 275e3c5de8 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions