summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-08-24 04:47:37 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-08-24 04:47:37 +0000
commite6495d48308451539c61b81c62766b312222545f (patch)
treeb3721816e86b3c24259d908c844f9e81839ec131 /tools/aapt2/java/JavaClassGenerator.cpp
parent2c916241d58c1554264efbf7cff58446e560ccf0 (diff)
parentafe708f5757fbeb4ae326cfa6e5d370fa1cfd6d1 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: b7ad07adad -s ours am: 7002e2a912 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions