summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-06-16 10:09:50 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-16 10:09:52 +0000
commitc02f85f0cde6c1a64aeec34da134461e3734a564 (patch)
treef600a700a723368b495094007267a629368cef8f /tools/aapt2/java/JavaClassGenerator_test.cpp
parenta092dcaa1c8578fa4abb13f10a6f03644442f0b9 (diff)
parent8a407d1037ddea85a688122a63a7df5fb85b9200 (diff)
Merge "Merge \"Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 65266b99d2 -s ours\" into nyc-mr1-dev am: 74ab23803c -s ours" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions