tree c30833e99e2a2855b2739ef6bca3a884bfa0072a
parent 307f47aa5def85d0c0bb4af725ff557707c5be86
parent 459df4ef8368ea84ce7d07981c6867a7b7fef14e
author Jean-Baptiste Queru <jbq@google.com> 1330105827 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330105827 -0800

am 459df4ef: am e7650c32: am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"

* commit '459df4ef8368ea84ce7d07981c6867a7b7fef14e':
  stagefright aacenc: Avoid warnings about incompatible pointer types