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-06-05 23:21:00 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-05 23:21:00 +0000
commitd4006f983f5c4103c1afce5239e82559400eda4d (patch)
tree2fb7e45ca22b9733fe867c2f7eb4b9528acbca13 /tools/aapt2/java/JavaClassGenerator_test.cpp
parenta36e80778910b4adb83764a30933e66f63661b56 (diff)
parent244f431898b9c6ebd45583ab3d9a5c50817cd5ae (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 80e43d2ed7 -s ours am: 617c70f07f -s ours" into rvc-d1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions