tree 2e8c0a664918a50b177b60544b147f72d62d73c8
parent 5e5414efd8973db1893db81e180baeb85c809e71
parent b8dde176dbb6dcec6b6c855fce16a3b563938588
author Android Build Merger (Role) <android-build-merger@google.com> 1472174065 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1472174067 +0000

Merge "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 am: 7c17f2ee60" into nyc-mr1-dev-plus-aosp