tree 5a343b523bcaeac290078a2a2187f28e886fc987
parent 27a7a5c13849e69655f2a41ed357714f9374c2ae
parent 81508de3d277db2ef3c8aa55b57ce3ce0a142e48
author Elliott Hughes <enh@google.com> 1357260442 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357260442 -0800

am 81508de3: am f0036944: Merge "Fix debug malloc."

* commit '81508de3d277db2ef3c8aa55b57ce3ce0a142e48':
  Fix debug malloc.