commit | b305918d968f6b4972505c917ef57e942ae851c9 | [log] [tgz] |
---|---|---|
author | Josh Gao <jmgao@google.com> | Thu May 19 19:54:23 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu May 19 19:54:23 2016 +0000 |
tree | 36987e37810baf019fb626408061b3a61b249e52 | |
parent | 53e507b19098fd3405902e8f57cf2772de5d50b0 [diff] | |
parent | a9c7faee187d3803795dfccd690eaa1beadcc561 [diff] |
Merge changes I40a11748,I5e56f17f,Ie3748b6c,I4e1d56a8 into nyc-dev am: d4af0d64de am: 11082d3a6e * commit '11082d3a6e7b4b0c848bcea70e8abf16885f3e08': 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: I76ee3a8d2de618c57b3696e78261fdbb917edab8