tree 62a3555429c3caf6d6220df764adf91a9ee9b991
parent 2139600b7ec911541e36576183010bf2f18fc82a
parent 9781293261fa9a969ab4ac68dfadc660e95fc0e1
author Deckard Autoverifier <deckard@android.com> 1311029038 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1311029038 -0700

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

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