tree fa13c7779a720a6f160738e00be4f9c8a51c7b79
parent a7f805c61239f042918f0ad328de197dbca90a01
parent 6ec08140b26bace3c679ef0c5c9b9e5b3d9d5164
author Deckard Autoverifier <deckard@android.com> 1311029178 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1311029178 -0700

am d4dee1a5: am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"

* commit 'd4dee1a57fdcd1bd1e7c621163e89039cf88d9f9':
  stagefright aacenc: Make the mem_malloc function 64-bit safe