tree db0180745ddfbcc2f514d9a96df16292a47d670a
parent 7ae998456c2564aff4ecbe6a6df214821f6e26cc
parent 0a91b11d286446fe7849a6f537b4a21a52f63399
author Elliott Hughes <enh@google.com> 1359166043 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359166043 -0800

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

# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '0a91b11d286446fe7849a6f537b4a21a52f63399':
  More debug malloc fixes.