tree 12bbfba7840e04adaa5c8d0a9d4bdf5759adf340
parent d541ee7f16d2a4ed61af75d92c8d801f5d972723
parent 3f0b1d7218b4e58c7e05dd939847315b6ba4a8a0
author Christopher Ferris <cferris@google.com> 1556044393 -0700
committer android-build-merger <android-build-merger@google.com> 1556044393 -0700

[automerger skipped] Merge "Move to android_mallopt for malloc debug calls." am: 28d257e48b
am: 3f0b1d7218 -s ours
am skip reason: change_id I75adddfc5048f732ee7ec27c17192efd5857af38 with SHA1 a90adf0a05 is in history

Change-Id: I830a72a875f45dcc31642bab952eea0dfd96e087