commit | 11082d3a6e7b4b0c848bcea70e8abf16885f3e08 | [log] [tgz] |
---|---|---|
author | Josh Gao <jmgao@google.com> | Thu May 19 19:50:19 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu May 19 19:50:19 2016 +0000 |
tree | 955f4ee00c2f2ba12ac557b7fecf82a82eab9272 | |
parent | 9110eaab4116c7edb38045b21a01226eccd5eb0a [diff] | |
parent | d4af0d64de042b0425bbae1f91d1720eebcf95a3 [diff] |
Merge changes I40a11748,I5e56f17f,Ie3748b6c,I4e1d56a8 into nyc-dev am: d4af0d64de * commit 'd4af0d64de042b0425bbae1f91d1720eebcf95a3': adb: use asocket's close function when closing. adb: switch the socket list mutex to a recursive_mutex. adb: clang-format sockets.cpp. adb: add implementations of mutex, recursive_mutex. Change-Id: Ida004443ba8cc7d41a2b81d77c7abb9917e08ff9