diff options
author | Elliott Hughes <enh@google.com> | 2014-05-20 20:18:01 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-20 20:18:01 +0000 |
commit | b65208d1a98c4cc6b4fbae302f7718f056e2fadd (patch) | |
tree | b363fd58c3012759d4b2a59d803b3b0273470ed0 /healthd | |
parent | aceba829f127349b331601fcc65293f5e81f7a65 (diff) | |
parent | f7a7e3c301fdf7d98d8bcabf6fefb0fcf5bbf90d (diff) | |
download | system_core-b65208d1a98c4cc6b4fbae302f7718f056e2fadd.tar.gz system_core-b65208d1a98c4cc6b4fbae302f7718f056e2fadd.tar.bz2 system_core-b65208d1a98c4cc6b4fbae302f7718f056e2fadd.zip |
am f7a7e3c3: am 6dfb039b: am 4a343436: Merge "Fix win32 undefined reference to `_socket_network_client_timeout\'."
* commit 'f7a7e3c301fdf7d98d8bcabf6fefb0fcf5bbf90d':
Fix win32 undefined reference to `_socket_network_client_timeout'.
Diffstat (limited to 'healthd')
0 files changed, 0 insertions, 0 deletions