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-10-18 18:25:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-10-18 18:25:56 +0000
commit9d9d405713af939b09cbfcdf1af97c8114d8c615 (patch)
tree1f88b70ab531711071ef59ec7359776f136b49fb /tools/aapt2/java/JavaClassGenerator_test.cpp
parent43bde0770cc8b6bcb1e297f5ad3683369c7b50f5 (diff)
parent7cfb33bc3ce24c4545ecc868f71a00264fbd45ed (diff)
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 3c7cd66c75 -s ours am: ce1184da3f -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions