tree 68bb1874d3d9e53bf356eca32c4f093d48cdf1e1
parent bac72abae4578bf2df9227a9c3d2c7233c83a06b
parent 6b1aa1b16bc2cf8ba17e33fca4ffc399368b356c
author Elliott Hughes <enh@google.com> 1362612299 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1362612299 +0000

am 6b1aa1b1: am db794197: Merge "Fix debug malloc."

* commit '6b1aa1b16bc2cf8ba17e33fca4ffc399368b356c':
  Fix debug malloc.