commit | 154c63ee2f3b59c2bfa4580e29b59aa96e989904 | [log] [tgz] |
---|---|---|
author | Josh Gao <jmgao@google.com> | Fri Sep 02 01:02:06 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Sep 02 01:02:06 2016 +0000 |
tree | f91cf1c31b861a34d8279db2cba1def07072eb5f | |
parent | 79c9ace21bd21c968c9a15f64be154f7a6849424 [diff] | |
parent | 8cc3fd82bfec95ee1baeec8da82bee093f474dbf [diff] |
Merge "libcutils: try all addresses in socket_network_client_timeout." am: f3d43032d2 am: b7011e0410 am: 03da262702 am: ccccbeca43 Change-Id: Ie8fe423b9a438d6a35a5ce7982b6fe433295c2a7