OSDN Git Service

Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp...
authorSudheer Shanka <sudheersai@google.com>
Tue, 30 Aug 2016 00:55:02 +0000 (00:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 30 Aug 2016 00:55:02 +0000 (00:55 +0000)
commit40b2477d91e21a09c28ffc5b3aa0024a16022716
treeb0fb2dc740554e23d2ad906b69fa7cd01d647b0b
parent7071097be49ff52c410550ff09f1807f6c4a53d1
parent6eaa44141c314b147d2553e76c7ac5d1f9e8102b
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c  -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa am: bc5775c18b  -s ours am: 6a9490f850 am: 380d9b9486 am: ea35f92f98 am: d5be8af093
am: 6eaa44141c  -s ours

Change-Id: I2e68f4687256293d382cc9ce47e77b1e8cad4cce