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-14 05:47:54 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-14 05:47:54 +0000
commit31f05766bec2ad60a52450b199b2758c64456b31 (patch)
tree91811a0ae2fc41f1cfc7b3233c0b6e6906daf5e5 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent888b803786f4891e4e625673cc8b736d1fff193c (diff)
parent2dabd8db227670e45670a9f119d8e8b6956aab50 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: bcec292d51 -s ours am: fb226f5848 -s ours" into rvc-d1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions