[automerger skipped] Merge "Move to android_mallopt for malloc debug calls." into qt-dev am: 5c06f8cecb
am:0068645d09-s ours am skip reason: change_id I6ce69465b0c04fae97b3622df2763a2996063d85 with SHA198180a344cis in history Change-Id: I244a795e8496cdd54d85214c5498492542a327ae
This commit is contained in: