summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-07-26 08:33:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-07-26 08:33:23 +0000
commit4ca3a013266e48be682ebf708f26f75cf622437a (patch)
tree2268ab4e8b606824b5b19b7835a46d5759b9689a /tools/aapt2/java/JavaClassGenerator_test.cpp
parent0752454dc73442c3f09ed5727d0d71f7b874a083 (diff)
parent586abb8c03e6bf20645b662cc4ea0783d7581dc1 (diff)
Merge "Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: a7f60741ae -s ours am: 799144a18b -s ours" into oc-dr1-dev-plus-aosp am: 8f148cdce4 -s ours" into oc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions