summaryrefslogtreecommitdiff
path: root/libc/malloc_hooks/malloc_hooks.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2020-09-25 17:16:52 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-25 17:16:52 +0000
commit501f5e1783f5df374c6c34e9af17975d7126d455 (patch)
tree4d9e34e75716909ffc13ef88537ebc019fa10624 /libc/malloc_hooks/malloc_hooks.cpp
parentb8ab12127f56258ade1ca2e51a801e53f9e82bb8 (diff)
parentd42324ece4f4d876eab172797278ff428e2175da (diff)
Merge changes from topic "arm64_branch-protection" am: 73ed0c4525 am: d42324ece4
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1420068 Change-Id: Idab907493868dccffad555ea803dce7126484844
Diffstat (limited to 'libc/malloc_hooks/malloc_hooks.cpp')
0 files changed, 0 insertions, 0 deletions