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)
commit3cf46af37b4d0604afdedebff03a0d3ab847bbcf
treec5a01c86341887b1a7fa57bb5af08c8515055fa1
parent258c3eab254199cf3231114b87ef010bc870d4ae
parent4ee46e5b99c464320a3d45b015202c74bed36d8c
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099  -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38 am: a106b52180  -s ours" into nyc-dev
am: 4ee46e5b99

Change-Id: I14593f2adae00ac390543e1bd2d189fca5ee9e05