| commit | 29bb179e450bb6005757e6bd2cc9f92cb92c1e99 | [log] [tgz] |
|---|---|---|
| author | Yabin Cui <yabinc@google.com> | Thu Aug 27 14:38:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:38:56 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 3f6e18fc217cbc3f7ea961ea917c7ad7023ad766 [diff] | |
| parent | 8d939a3094dfcf6388a5d4bbddeff6bf1cd3d8ab [diff] |
am cd159ba3: am 4edb97ab: (-s ours) am f03aa667: am fbdd5ee2: Merge "adb: keep all asocket operations in the main thread." * commit 'cd159ba349e6c336f1407697d0f3e4e4be6845f6':