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:10:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-08-26 01:10:59 +0000
commitaf5b82c7dc3a6d31ea4be7774fd9ba6e4c8364c0 (patch)
tree2e8c0a664918a50b177b60544b147f72d62d73c8 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent6ad34dc43adc4a3985b926dfc7e98b2d5257e4e7 (diff)
parent7c83c68c7104d4bb340fa0d3c3f117890fa94ac6 (diff)
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 am: b6cc1acb63 am: 258c3eab25" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions