| commit | f2bebc4099197940373e1f346d7c629d6e3d1604 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Wed May 18 23:25:20 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 18 23:25:20 2016 +0000 |
| tree | 8cfbb7f54c03e0e3d2ad86cf14f0f51bf914e19a | |
| parent | 635caed6bf58c156b22d3b31db9b8814a651f628 [diff] | |
| parent | bd050d014a335e3c11f3f659e9f1c792f8e25c88 [diff] |
Merge changes I5e56f17f,Ie3748b6c,I4e1d56a8 am: cea14958d2 am: 71c062f40a am: ebb08fb9a6 * commit 'ebb08fb9a6653a35823bf26ca3ec6af3d0b81dca': adb: switch the socket list mutex to a recursive_mutex. adb: clang-format sockets.cpp. adb: add implementations of mutex, recursive_mutex. Change-Id: Id9c9284fd3d13abd183d7be6cd96c3c1cf589350