tree 9def7c3655cd0af426a08be3f39726a54a6c9fe8
parent c76ca242ce2bd26c97c78ddf6842429850f541d9
parent 6bc542e0f31bcb7ce5ff466c7aa4676f6aa91f7d
author Jean-Baptiste Queru <jbq@google.com> 1330376980 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330376980 -0800

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

* commit '6bc542e0f31bcb7ce5ff466c7aa4676f6aa91f7d':
  stagefright aacenc: Don't address a Word32 with a Word16 pointer