diff options
| author | Yabin Cui <yabinc@google.com> | 2015-08-11 19:05:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-11 19:05:43 +0000 |
| commit | 0660be899f2d907dedbcb643315b73e652ec9510 (patch) | |
| tree | cf655ed53f335273d71e84535a3e3f1a8812ff3e /libc/malloc_hooks/malloc_hooks.cpp | |
| parent | de0fb393ae8136a5958fe17eee0c6285e2f7f91a (diff) | |
| parent | a6a12a7804402273e193074a58162cc0b3890812 (diff) | |
am a6a12a78: am 0fdcdd00: Merge "Fix flaky test time.timer_settime_0." into lollipop-mr1-cts-dev
* commit 'a6a12a7804402273e193074a58162cc0b3890812':
Fix flaky test time.timer_settime_0.
Diffstat (limited to 'libc/malloc_hooks/malloc_hooks.cpp')
0 files changed, 0 insertions, 0 deletions