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-25 23:41:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-08-25 23:41:08 +0000
commit4ee46e5b99c464320a3d45b015202c74bed36d8c (patch)
treecf03c3cd1915ac8f296b9bfadf33cd0ce6f6489d /tools/aapt2/java/JavaClassGenerator_test.cpp
parent8d660eebad723f29b6d2195c1dca9c607c66a273 (diff)
parentb6cc1acb632910b0dee655ee7f228b56fcdf40d7 (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" into nyc-dev
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions