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:23:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-22 11:23:51 +0000
commit63f9868a520ba15bb7a58be2d70ddf7780a4a94d (patch)
tree888705539fad0bd555aa00982269ff417b0019d2 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent171a77af76cb3047650b027eba7f15f6fe068c6f (diff)
parent115682dcbd9734417a1b6d5e446e64bfc7438fe1 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: da5f0466b9 -s ours am: 12954bad1b -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