OSDN Git Service

Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch"...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 26 Aug 2016 01:18:48 +0000 (01:18 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 26 Aug 2016 01:18:50 +0000 (01:18 +0000)
commitf5b9d2c881b1e9a3ef89de9923c866dfbb6eef26
tree436eceb341430210c82e722c69e8a20eb4748282
parent9e2f76cac393b6be8ac7dbdeaa08e6d81bffbda5
parent6eaa44141c314b147d2553e76c7ac5d1f9e8102b
Merge "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" into nyc-mr1-dev-plus-aosp