summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-05-20 13:51:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-20 13:51:32 +0000
commita3667ea0ddd12e861d424ae659bdd9b4e28087e5 (patch)
tree97f060fcedd4981e14d977dd237fdaf56bbe34c1 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent50eec70dc9f080e1e31cfc513bc0132925464f17 (diff)
parent9dca633f510572ac4186f480431572ff8be395dc (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d0461a536c -s ours am: bd7296c448 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions