tree 68e6f19861c25262021ba27b96d3368b93d1996d
parent 368ae62e9d92d4f55583c7133cf219c192141e7e
parent 26bb7bf86c5201eae8461493c2df8ae73321385d
author Sudheer Shanka <sudheersai@google.com> 1472166469 +0000
committer android-build-merger <android-build-merger@google.com> 1472166469 +0000

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

Change-Id: Id2ddb640c8d041f13a78c5f07fb1749968618b61