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:30 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-08-25 23:41:32 +0000
commit5f5403def8bacffde366b63c0c047069129dfd3b (patch)
treecf03c3cd1915ac8f296b9bfadf33cd0ce6f6489d /tools/aapt2/java/JavaClassGenerator_test.cpp
parent555fbf30d205eee86e751672e5711554a1cf56d8 (diff)
parent4a3caefd6ce4cd2bb27261796150dce2097b601c (diff)
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours am: 9080d4462e am: 75c7391a41 am: f6361752ca am: 7586e03e06 -s ours" into nyc-dev
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions