tree 95eac66b15e1f90abd34b7a6081bb4ce5249aca9
parent 584f703907ab34c5944cfa558f738b5d93ad0633
parent b07b5f745ae62a8106efefe1f819bd69c8eea4d1
author Amith Yamasani <yamasani@google.com> 1471630653 +0000
committer android-build-merger <android-build-merger@google.com> 1471630653 +0000

DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7b4 am: 29ae7b1a27 am: 39c7879365 am: 5841c492a7  -s ours am: f705730667
am: b07b5f745a

Change-Id: I594d38d8ccc37beefc533c18e3eccf76eb3b3669