tree 0ecbd0769f339854cca023a8cf56e75f0ba5aa63
parent be444488fc074f629e24d1ee2d19e4d9c9f06d27
parent 69ce038818460eeaa1ab7c1e9cd7459c6ede1ce3
author Jean-Baptiste Queru <jbq@google.com> 1330105540 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330105540 -0800

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

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