summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-07-22 16:34:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-07-22 16:34:52 +0000
commit1412b5d927068c4ba19a88776a3612cb38a477f9 (patch)
treec687fb1ed10c2d9bca3206b7385d2fec5fc70fdc /tools/aapt2/java/JavaClassGenerator.cpp
parent418530d4f4967cc22556e4ba0af4268f89bc389e (diff)
parentb22a22dca3e1c8e1d9b9c83905b8bc222191a058 (diff)
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 86817456ff -s ours am: fd00212302 -s ours" into oc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions