tree 8754aa33dbc07d012c754bbadea153a93788ca23
parent 216dfcf90ea9cf75fd7e1aeaf2d4fa6e16533caf
parent ce909f49b320e77c32ba43400119feafb3b5b725
author Christopher Ferris <cferris@google.com> 1596042623 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596042623 +0000

Merge "Add support for new scudo mallopt options." am: 3025f128f3 am: ce909f49b3

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1374707

Change-Id: I110f2aa86d21d9fafdf223a841585f631eda91b9