OSDN Git Service

Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a1...
authorAmith Yamasani <yamasani@google.com>
Thu, 25 Aug 2016 23:49:30 +0000 (23:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Aug 2016 23:49:30 +0000 (23:49 +0000)
commitd8ffc6239b244390f894456c265872c5f9f129bd
treededb79382f211b4d7ebb60ee3a8f91c6528c9bd0
parentf7259775d8d098f03b1e95db6688c72dba5b41de
parent5f5403def8bacffde366b63c0c047069129dfd3b
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