tree 2c2e0fdc682b66bec60935bbfd324920de2c6875
parent 29ae7b1a27308717bcd321ed5884b16cb340fbc9
parent b51e98becbca9c28e37d9806124ecebf6f8d7dd0
author Sudheer Shanka <sudheersai@google.com> 1471627349 +0000
committer android-build-merger <android-build-merger@google.com> 1471627349 +0000

Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev
am: b51e98becb

Change-Id: I16fab19d30345e14076fda71d1d821539ceb70d2