summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-07-20 10:11:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-07-20 10:11:43 +0000
commit1866df21f9ea8c5ee9de0fb7d91182e856d46ac9 (patch)
tree682a7846840ed27e236c3ae72b732f9703eaa185 /tools/aapt2/java/JavaClassGenerator.cpp
parentf9a0de0fa3566111a1c506967f14a768246ea624 (diff)
parentbb5cb8d3eea8c18e2a68f57bb0dcfdf235e35cf3 (diff)
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 3f9462d6a3 -s ours am: 3b79072040 -s ours" into oc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions