diff options
| author | Bernie Innocenti <codewiz@google.com> | 2018-08-09 19:27:18 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-08-09 19:27:18 -0700 |
| commit | 1629545db71a20c4f12ba43c6435794ec09e3681 (patch) | |
| tree | b35f438448725ed8ec5efde35227224c4558c201 /libc/malloc_hooks/malloc_hooks.cpp | |
| parent | eda45437ec62ac2f95dff84f420577539af5d75e (diff) | |
| parent | 58f4a1571b4c6d95dfe3ab748afc3470f68eaa82 (diff) | |
Merge "Clear the resolver timeout when setting default __res_params" am: 817f578bf4 am: 02f85ccb90
am: 58f4a1571b
Change-Id: I68678b3f84d25b0bd9e81e6977aae29b36718f79
Diffstat (limited to 'libc/malloc_hooks/malloc_hooks.cpp')
0 files changed, 0 insertions, 0 deletions