tree 0ecbd0769f339854cca023a8cf56e75f0ba5aa63
parent 8d9d3f917ea710dc01100289d87c746453541554
parent b445a23c742d92d99e7670a4f73498195bf7351d
author Jean-Baptiste Queru <jbq@google.com> 1330105694 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330105694 -0800

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

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