diff options
author | Bernie Innocenti <codewiz@google.com> | 2018-08-09 19:23:19 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-08-09 19:23:19 -0700 |
commit | eda45437ec62ac2f95dff84f420577539af5d75e (patch) | |
tree | d4fca8816c68cb75b5b419dc1bb6e7501779ae50 /libc/malloc_hooks/malloc_hooks.cpp | |
parent | 4d3a91b08c47410b89af9864d9f77586440b4f2c (diff) | |
parent | a39b276d5649e6a2db36d3b2da5210292d08b1c9 (diff) |
Merge "Make the resolver retry timeout configurable via __res_params" am: fce5dae8a3 am: b761df4ff3
am: a39b276d56
Change-Id: I760e7092068876e74f63926e4c7919d04fbdf13a
Diffstat (limited to 'libc/malloc_hooks/malloc_hooks.cpp')
0 files changed, 0 insertions, 0 deletions