summaryrefslogtreecommitdiff
path: root/libc/malloc_hooks/malloc_hooks.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-08-30 06:52:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-08-30 06:52:41 +0000
commit1d2717bdc8185aa7430dc59eb3eb5c292de8c1a7 (patch)
tree94c3b6a58d3d987c2797cca8e1abf66ab6439f49 /libc/malloc_hooks/malloc_hooks.cpp
parentbe3dd552552c4741c1414174c8944f71edd8994a (diff)
parentfb4696eca6614a3d8f7723d4955bbc0c8054c9ba (diff)
Merge "[automerger skipped] Fix OOB read in DNS resolver am: 43264bc365 am: c5ea7569a8 am: 2c2546b158 am: cf6b3ecd4d am: e8fad600d5 -s ours am: bb8ddbde70 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'libc/malloc_hooks/malloc_hooks.cpp')
0 files changed, 0 insertions, 0 deletions