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-22 11:22:44 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-22 11:22:44 +0000
commit171a77af76cb3047650b027eba7f15f6fe068c6f (patch)
tree888705539fad0bd555aa00982269ff417b0019d2 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent02499d318763256ef401cca5d2b808aafd2569cf (diff)
parent0dcfdba30dd4b1bcb2827fd234cc77d3dd4f4b62 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 91d2a1cc28 -s ours am: bdce4d4bd9 -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