tree 5ab9d6dcfa3816a64ffd5ba5885343f38bc0416e
parent 6e85ad7d267f47ba3a367651a70d147725dc26ae
parent 237fa1901fee9617e5e8073470bd4fb7a224541f
author Jean-Baptiste Queru <jbq@google.com> 1339450162 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339450162 -0700

am 237fa190: (-s ours) am 68ecb32e: Merge "stagefright aacenc: Move system headers before local headers"

* commit '237fa1901fee9617e5e8073470bd4fb7a224541f':
  stagefright aacenc: Move system headers before local headers