tree d470055e9c71be4cb3b5524050e347d497cc40a3
parent f16948d0bcf0aadd40172c5b050d0c26e247c1af
parent 5a2efacf13278a3c2dcf9004eeae77a7afea55e7
author Christopher Ferris <cferris@google.com> 1548209767 -0800
committer android-build-merger <android-build-merger@google.com> 1548209767 -0800

Merge "Bionic malloc debug: add a new option "abort_on_error"" am: 0a692a6d8d
am: 5a2efacf13

Change-Id: I5ad3253e4abf7b1de6bd2a038017e9894ebba07a