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:35:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-07-26 08:35:43 +0000
commit72f0fd0cd30470463b7f4df19882f8947ee1b9ab (patch)
tree2268ab4e8b606824b5b19b7835a46d5759b9689a /tools/aapt2/java/JavaClassGenerator_test.cpp
parent4ca3a013266e48be682ebf708f26f75cf622437a (diff)
parentcd126286ed7c36ec7901ea3f1a299ddcb63a509f (diff)
Merge "Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: b4e8cad186 -s ours am: 0ad45f6f76 -s ours" into oc-dr1-dev-plus-aosp am: eb5a73f4ec -s ours" into oc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions