OSDN Git Service

Merge "Revert "Make mallopt available in the future."" am: 8f7a987cd0 am: bf52fee214...
authorChristopher Ferris <cferris@google.com>
Wed, 31 May 2017 18:57:53 +0000 (18:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 31 May 2017 18:57:53 +0000 (18:57 +0000)
am: c39af283fe

Change-Id: I3e1bf1f0fc8abbbb58e52fa7afcbafa0bdbd5efb


Trivial merge