summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-06-09 14:49:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-06-09 14:49:22 +0000
commitd2b9de199df9968f3e77483170d20f180ee00bd5 (patch)
treeaaca81f75ca4189c6d42f83f54858bb7222d6e47 /tools/aapt2/java/JavaClassGenerator.cpp
parent76dd0db12826e391bbfefa261201ca6fff779b93 (diff)
parent1b5b7e09838c2df625371793cde94058b3e7001f (diff)
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 9edd318666 -s ours am: 62e404112a -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions