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:03:12 +0000 (00:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Aug 2016 00:03:12 +0000 (00:03 +0000)
commit710c5ea5a67e17881ae3f0239ea3eed4fdd17a8b
treec9afd6499b01c4bc010df4f1eccc6f1360aeb5aa
parent216e40b926de4345749548069a83cc072c367ac0
parentd8ffc6239b244390f894456c265872c5f9f129bd
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
am: d8ffc6239b

Change-Id: Ibcaa7f162284c8a18fc68202fc169284e37099e5