OSDN Git Service

Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2...
authorAmith Yamasani <yamasani@google.com>
Fri, 26 Aug 2016 00:48:15 +0000 (00:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Aug 2016 00:48:15 +0000 (00:48 +0000)
am: 4ee46e5b99

Change-Id: I14593f2adae00ac390543e1bd2d189fca5ee9e05


Trivial merge