tree 1dcf8f2a3a77ab29f1c7c0ed3b24176db3778e46
parent 308eb8f51f430e851c672fe5a034693995c7e95d
parent 19bb62613f512b62d492fb4caf36de88fd1914dd
author Jean-Baptiste Queru <jbq@google.com> 1330377315 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330377315 -0800

am 19bb6261: am bf826923: am faf38b24: am 9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions"

* commit '19bb62613f512b62d492fb4caf36de88fd1914dd':
  stagefright aacenc: Add prototypes for arm specific implementations of functions