tree 1f62aca47a93bf5c50885b3238166397622237f1
parent 68d8ac7ce5b14fe589f3c555eea2bbdc7016d8e0
parent 17f2af7e1f08440814ade84898f6506e15fea15c
author Andrew Hsieh <andrewhsieh@google.com> 1345623674 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345623674 -0700

am 17f2af7e: am a2b32b34: Merge "Update malloc.h"

* commit '17f2af7e1f08440814ade84898f6506e15fea15c':
  Update malloc.h