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