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-07-30 18:59:29 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-07-30 18:59:29 +0000
commitd0353c05da98411a7b7a0df4d5d3d8463cdd3c27 (patch)
tree43f54d8049a2ede94e0017d632ada745b86950fe /tools/aapt2/java/JavaClassGenerator_test.cpp
parent90f37252e0f5e6623f09421f8101fa7bc41ac8e3 (diff)
parent6bfacb540c3e2d593e7917a88f6611157696c51a (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8292b6bb44 -s ours am: b0d1548ece -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