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:20:16 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-05 23:20:16 +0000
commitfb7b1afab0755d3f05888a2e36e202c26f1b0f7a (patch)
tree8cf0580d0fc28c6db7f4d03b05e49a5e430897ce /tools/aapt2/java/JavaClassGenerator_test.cpp
parent31f87c429e42ccceb4a40f1b1757f083ccc5a202 (diff)
parentc7d0e0c6cd94829aa5a9fa83745857b93a81e882 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 51ae4ade4d -s ours am: 06d1b3a584 -s ours" into rvc-d1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions