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-06-02 04:52:19 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-06-02 04:52:19 +0000
commit57a1500698513593e7725f0dc346219f2839daba (patch)
treef9612031be23c2be4a4b92817f37d6d3050dbcbf /tools/aapt2/java/JavaClassGenerator_test.cpp
parent686c24bb5d208415a262355cc7c5c61e4ef9fcee (diff)
parent4ce9981fd4d9941fbcddae71a38a35bc369456d7 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: b3b93d72fb -s ours am: b5b893485e -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