tree 5b5f2c1a7b75b5ce68410105cb965385351aaea2
parent bf52fee21434609b4da46304d8407fc5844213dc
parent 15eaaddef9fffda1209e9cc576b47b0f6e0cb379
author Christopher Ferris <cferris@google.com> 1496262058 +0000
committer android-build-merger <android-build-merger@google.com> 1496262058 +0000

Merge "Move mallopt to correct section."
am: 15eaaddef9

Change-Id: I592a15ea6503f8753c9fdc512fa383d55f48525e