tree 7c2562760e7f9f47fe7b97b434a779550f0b12aa
parent a5addb0aba3f24756a8427cd91946a39b73d700c
parent 70dcd3db169f1ccc045bd4a3d6dc69e2c3734f2b
author Florian Mayer <fmayer@google.com> 1548706291 -0800
committer android-build-merger <android-build-merger@google.com> 1548706291 -0800

Merge "Allow to reset malloc hooks." am: 543b4013e7
am: 70dcd3db16

Change-Id: I008d032695246b66dbd3ce4fe3fbda3477498f2c