tree a3487a896595852219292e067fa6a3d9f25abed6
parent 90ac799241f077a7b7e6c1875fd933864c8dd2a7
parent 89c93eb127ac1d1ad0cc4c3f3635fb54397fd1d7
author Jean-Baptiste Queru <jbq@google.com> 1330377285 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330377285 -0800

am 5b299d2f: am 18643e70: am 6bc542e0: am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer"

* commit '5b299d2f9038452aa09a97d4f2ce57ec20bbc06a':
  stagefright aacenc: Don't address a Word32 with a Word16 pointer