tree 85a7e80ca283637ae8fe23ed1a75f25abd482b4f
parent 88af723267e86c7b2a685f97c6e442d3766ad9a9
parent f07db75443cce4ab96c93bdaa0793d7b8e87547e
author Elliott Hughes <enh@google.com> 1359166185 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359166185 -0800

am f07db754: am 0a91b11d: Merge "More debug malloc fixes."

# Via Android Git Automerger (1) and others
* commit 'f07db75443cce4ab96c93bdaa0793d7b8e87547e':
  More debug malloc fixes.