summaryrefslogtreecommitdiff
path: root/libc/malloc_hooks/tests/malloc_hooks_tests.cpp
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-04-13 17:32:19 -0700
committerDan Albert <danalbert@google.com>2015-04-13 17:33:51 -0700
commita0ecd5b2b4bcb2979f0105c444fa48ef4a66ea8e (patch)
tree290111b858d8575eedd1deaf94668d6c8a92c38f /libc/malloc_hooks/tests/malloc_hooks_tests.cpp
parentde889741201faa338e01babdfd10bbd597769e60 (diff)
Skip merge-failed messages from Gerrit.
Change-Id: I2d8055a44cd78f95e64d6cf88e9efdd610a4fa88
Diffstat (limited to 'libc/malloc_hooks/tests/malloc_hooks_tests.cpp')
0 files changed, 0 insertions, 0 deletions