summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-08-26 01:11:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-08-26 01:11:09 +0000
commitd3658f16c64a4c0c5a1d5992390568061e511969 (patch)
tree2e8c0a664918a50b177b60544b147f72d62d73c8 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentaf5b82c7dc3a6d31ea4be7774fd9ba6e4c8364c0 (diff)
parent09723e179825ce6336f532325484a3ef95d5e69b (diff)
Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38 am: a106b52180 -s ours" into nyc-dev am: 4ee46e5b99 am: 3cf46af37b" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions