tree f60633b7ed42f63f0bbc3e8de357adb43b0882ad
parent 117a383099852e29a9e2fb9aae053b0cd34a5446
parent c8aedeeaf6211cbd3480d943586924533aa98f1f
author Sudheer Shanka <sudheersai@google.com> 1472071096 +0000
committer android-build-merger <android-build-merger@google.com> 1472071096 +0000

Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7
am: c8aedeeaf6

Change-Id: Id8f62a0c41004aa713d61a87f59e7ee1eff4ee0a