tree dedb79382f211b4d7ebb60ee3a8f91c6528c9bd0
parent 380d9b9486ebc024d0378dd5213b651c5405a05e
parent 555fbf30d205eee86e751672e5711554a1cf56d8
author Sudheer Shanka <sudheersai@google.com> 1472168956 +0000
committer android-build-merger <android-build-merger@google.com> 1472168956 +0000

Merge "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" into nyc-dev
am: 555fbf30d2

Change-Id: I03d222633c7a276b889035faf900e2fa66f7289f