tree 2f7a7c9301fe6bfd4256ffe1842a27fd89efe03d
parent d92a683fb97db7602fcf9c3461f118f169b4e439
parent 254cf5973ebe5ebdce9ef261d826e88ed2f67f58
author Jean-Baptiste Queru <jbq@google.com> 1330442380 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330442380 -0800

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

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