OSDN Git Service

Merge "[automerger skipped] Merge "Move to android_mallopt for malloc debug calls...
authorChristopher Ferris <cferris@google.com>
Tue, 23 Apr 2019 21:41:10 +0000 (14:41 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 Apr 2019 21:41:10 +0000 (14:41 -0700)
am: 58722b4558 -s ours
am skip reason: change_id I6ce69465b0c04fae97b3622df2763a2996063d85 with SHA1 4740d54243 is in history

Change-Id: I11d68de26dbcc95869609440f0ca491493805d71


Trivial merge