summaryrefslogtreecommitdiff
path: root/libc/malloc_hooks/malloc_hooks.cpp
diff options
context:
space:
mode:
authorYabin Cui <yabinc@google.com>2015-06-19 18:40:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-19 18:40:59 +0000
commitb245bc750021ce6d220e71625fca66620cdd1f05 (patch)
treee7d85467751d4fd93f079400667312687f0038d1 /libc/malloc_hooks/malloc_hooks.cpp
parent64e9e71cdb7d88397e510e1986d494b797ed3b45 (diff)
parent0f455612d3325932a851418634a17a61307948c5 (diff)
am 0f455612: Merge "Fix flaky test of timer_create_multiple in L." into lollipop-mr1-cts-dev
* commit '0f455612d3325932a851418634a17a61307948c5': Fix flaky test of timer_create_multiple in L.
Diffstat (limited to 'libc/malloc_hooks/malloc_hooks.cpp')
0 files changed, 0 insertions, 0 deletions