| commit | 136f9541abb8818c79c8cc1220b89cff47fef5fd | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Thu Aug 02 16:35:17 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 02 16:35:17 2018 -0700 |
| tree | 2d9cf26363dc177a4fd5b29e716e7c0d6a635f9f | |
| parent | 3251bb5fd646ad87608f027c304b953ec58988fa [diff] | |
| parent | 6ff04455989098ae4f6d53a5f520fbb6a0861940 [diff] |
Merge "adbd: when rebooting, don't close socket before pausing." am: 9c16700e36 am: 2784b0a6bd am: 4cb43de624 am: 47b605ab6b Change-Id: Ib888a7910bfd16ded70da536e983a92a4785fc3b