summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorSudheer Shanka <sudheersai@google.com>2016-08-26 01:09:53 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-08-26 01:09:53 +0000
commit5bb02677a88bf0bce45717693b8415d318d865d5 (patch)
tree4a2cc502be3037cc3751e034a1ba03703f3997b3 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent09723e179825ce6336f532325484a3ef95d5e69b (diff)
parent6a031dec20f9df86e2e00651d1a96cbf073a5f9d (diff)
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa am: bc5775c18b -s ours am: 6a9490f850
am: 6a031dec20 Change-Id: I907b9dc6996a268b592db3a1b8ca8cfab8ef63e6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions