tree 1dce16614009ad763200b158f1d0e051ed727d6a
parent f4825a431d3f4ab9a8e0b3b7a3a7392724405f8b
parent 1727db3961da8b308c0834c05b9f5e29435ddfd0
author Amith Yamasani <yamasani@google.com> 1470952977 +0000
committer android-build-merger <android-build-merger@google.com> 1470952977 +0000

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

Change-Id: I5240e943a397f59f4095ede9b3b618836c3ad4ba