OSDN Git Service

Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a1...
authorAmith Yamasani <yamasani@google.com>
Fri, 26 Aug 2016 00:48:44 +0000 (00:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Aug 2016 00:48:44 +0000 (00:48 +0000)
commitfd539fc8e0846016aeb6e684d680e49e927b7e91
treec5a01c86341887b1a7fa57bb5af08c8515055fa1
parent5e403681cdd1d55c4af603e0cd82c43932b3a751
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: If316a8c2efca734d3118214bf7c93d8f0d22a4c0