| commit | ebb08fb9a6653a35823bf26ca3ec6af3d0b81dca | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Wed May 18 23:22:47 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 18 23:22:47 2016 +0000 |
| tree | 887e58ca46b73d1ef7c238ac5115830d1854dc41 | |
| parent | 5d32a9821ddb2b9f85931ccccc89f28af42c5659 [diff] | |
| parent | 71c062f40ac9ac5175f55bce03ce0cb8eb540710 [diff] |
Merge changes I5e56f17f,Ie3748b6c,I4e1d56a8 am: cea14958d2 am: 71c062f40a * commit '71c062f40ac9ac5175f55bce03ce0cb8eb540710': adb: switch the socket list mutex to a recursive_mutex. adb: clang-format sockets.cpp. adb: add implementations of mutex, recursive_mutex. Change-Id: Icd8a74f1052f7b4c4616ddf23b65c7208195202c