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-15 01:26:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-15 01:26:44 +0000
commit875debe4012ba25d62f7cc473c98f5f58f9fdac8 (patch)
tree649f53fd818af7af467c5b17135143ceb39cb494 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentaee4d8a058daefe6edfa4541aa90df06aba49042 (diff)
parentef74b45aae6ab4d1fc15d89935ecc104edeff941 (diff)
Merge "Merge \\"Only skip trimming task if the stacks are not null.\\" into nyc-dev am: 6ba96df815 am: f9eed3bf86" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions