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-01 15:12:04 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-06-01 15:12:04 +0000
commitf75bd54b8372cec36e6169297f676b9f2aa53993 (patch)
treefefbadbf9f76394b92c3ec6d372aa4183a2b6894 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent6e7cb7c968cfbabe79829219badfda5e154f9797 (diff)
parentbdf98633c69103db0e7bde3a2718b12c90d984d7 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9070e5ab3a -s ours am: e35caabec8 -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