tree 09b9b21af72d3ec57979d8cde93c63b72e2db7cc
parent da12204605114684d731deb475c8c314e9d3527c
parent 476df7e91b41e6db39f84c5765ab6c747cc49b13
author Jean-Baptiste Queru <jbq@google.com> 1330390935 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330390935 -0800

am 7b6b81f8: am f016dc1b: am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"

* commit '7b6b81f89538d34415869710cbf464ba7c28bf9b':
  stagefright amr: Avoid C++/C99 for loops with variable declaration