| commit | cd159ba349e6c336f1407697d0f3e4e4be6845f6 | [log] [tgz] |
|---|---|---|
| author | Yabin Cui <yabinc@google.com> | Thu Aug 27 11:56:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:56:20 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 8955ae5af369a0d876b1732c4762f2972b0f6d83 [diff] | |
| parent | 4edb97abb71c1d45214e723ce2b82bff0208ee98 [diff] |
am 4edb97ab: (-s ours) am f03aa667: am fbdd5ee2: Merge "adb: keep all asocket operations in the main thread." * commit '4edb97abb71c1d45214e723ce2b82bff0208ee98':