| commit | 12943c65a23f25c55ecf729aa13e4ec36adb2d1a | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Thu May 19 21:11:24 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 19 21:11:24 2016 +0000 |
| tree | 63f4e45c9927278fb18d97e24cb3271bbc291714 | |
| parent | 99908228b384c1eb613932281f35a6c5f0efcab3 [diff] | |
| parent | b305918d968f6b4972505c917ef57e942ae851c9 [diff] |
Merge changes I40a11748,I5e56f17f,Ie3748b6c,I4e1d56a8 into nyc-dev am: d4af0d64de am: 11082d3a6e am: 2c0f553cd6 * commit '2c0f553cd6907379ab98b2fc0fa0ee24b058af06': 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: I2c6619c4c49cae60c4c6e828f2057aa3f9bb6f1b