am e2594b85: am 4cd2b343: am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"

* commit 'e2594b85093441e03150c7cfc540abc626884eaf':
  stagefright amrwbenc: Make the mem_malloc function 64-bit safe
tree: bb1ab3664118d4b6187b3fb5796accdb18fba8d0
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/