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 12:30:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-22 12:30:57 +0000
commitdde0568e57ca081d30791d26a8cfc0e5fc9752a4 (patch)
tree14ce77591432911b53f5f6a93ac2ff0eceb31be9 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentedce52d29b54b52edc1204ad200e88d27f7e174d (diff)
parente7442d501549d7135ea34a842c970b9e618706ff (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 7ca1d7b278 -s ours am: 2a5ccbbe9d -s ours am: fec78ce510 -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