tree c37ef4fa3370991550f35e04eb5bb6d25dab03ee
parent f6361752cadec53e2c1e26bb5d9251014b92ae26
parent 97194798abd70c09a274a1539fb52767477dfef6
author Sudheer Shanka <sudheersai@google.com> 1472167334 +0000
committer android-build-merger <android-build-merger@google.com> 1472167334 +0000

Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905  -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc  -s ours am: 603a69ffb4
am: 97194798ab

Change-Id: If4a1716de3d54d6a08025665cdff51edc1b2f6da