OSDN Git Service

Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp...
authorSudheer Shanka <sudheersai@google.com>
Fri, 26 Aug 2016 00:03:15 +0000 (00:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Aug 2016 00:03:15 +0000 (00:03 +0000)
commitc16baae14f7aa30320de71e555cd23e3506f0c28
treec9afd6499b01c4bc010df4f1eccc6f1360aeb5aa
parent710c5ea5a67e17881ae3f0239ea3eed4fdd17a8b
parent26fa4042e1aa7ac60be8e7c4e5970b1bb43d69c7
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 am: 02ba5ef875
am: 26fa4042e1

Change-Id: I12c0a05425d5cf141d328745a19d5e56db196456