tree cf03c3cd1915ac8f296b9bfadf33cd0ce6f6489d
parent 4ee46e5b99c464320a3d45b015202c74bed36d8c
parent 6a9490f850131a9d4c2cb3acb64c8ad311485e68
author Android Build Merger (Role) <android-build-merger@google.com> 1472168476 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1472168480 +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