summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-07-07 20:59:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-07-07 20:59:49 +0000
commita57cbde2608892707e68dfe3345760c46083b6ae (patch)
tree2beb5e084137bc1290a6d3c60c749946cb6e1587 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent33597d225bd3b06dd951a9bf1d8b8ca2f0d1672f (diff)
parent2642ae57ebc787017819dc3bfcf66992c8aa04a8 (diff)
Merge "Merge \"API 25 is frozen, so we can\'t change API.\" into nyc-mr1-dev am: 663cfc0f8d" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions