tree 68f5e25c7493d2d2b39b267d8e60525adce56af3
parent 92de60bd7fce725404ee2ace951b68aed4f0bf25
parent 792aaab77a3514b268c192717f2da25a58dc40fb
author Amith Yamasani <yamasani@google.com> 1470949583 +0000
committer android-build-merger <android-build-merger@google.com> 1470949583 +0000

Merge "Clean up when recycling a pid with a pending launch" into nyc-mr1-dev
am: 792aaab77a

Change-Id: I908d6adb238d47b42f4c756e07ec1d0ac137f8d5