OSDN Git Service

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

Change-Id: I318f22e95f2ef59b240bf5b8bfc87eb0babb2d98


Trivial merge