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