OSDN Git Service

Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch"...
authorSudheer Shanka <sudheersai@google.com>
Fri, 26 Aug 2016 00:48:59 +0000 (00:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Aug 2016 00:48:59 +0000 (00:48 +0000)
commit7c17f2ee60506f16de0f7a8e4229e1c619cf020b
treec5a01c86341887b1a7fa57bb5af08c8515055fa1
parent39d2fe3a4b5c499c8e6a4e1342197e953212a9a5
parentcca29c7284c60f0c33d1dfefccd793c337d1e6f2
Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905  -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc  -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39 am: 71933abbdc  -s ours" into nyc-dev
am: cca29c7284

Change-Id: I27e737406b9c9e6089750c790b3249d0b6d6a98b