tree dfaf79118e40f2da5979b9a49c86f06449c75357
parent 68e37dacc065eebb971d443722b7a8413ff403d6
parent c06c3603e09a85136eb97d1d8ba1a49fcebae93b
author Deckard Autoverifier <deckard@android.com> 1311028705 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1311028705 -0700

am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"

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