tree 077db5bfd1c02ca8824533af937bc1842b3d24a4
parent b7f0d825c56dced10bb7df7cfc624ef9ebffe21c
parent 29fd8cdbe554ca65c57dd9eea59dc57e3392acc3
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