From: Amith Yamasani <yamasani@google.com>
Date: Thu, 25 Aug 2016 23:49:30 +0000 (+0000)
Subject: Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a1... 
X-Git-Tag: android-x86-7.1-r1~723^2~3^2~131
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d8ffc6239b;p=android-x86%2Fframeworks-base.git

Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189  -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b  -s ours am: 9080d4462e am: 75c7391a41 am: f6361752ca am: 7586e03e06  -s ours" into nyc-dev
am: 5f5403def8

Change-Id: Id8752560cdf0d732f96d5987a5fe2cc79883ac10
---

d8ffc6239b244390f894456c265872c5f9f129bd