tree 09b9b21af72d3ec57979d8cde93c63b72e2db7cc
parent 6a22ed0a4b213484d3ec58d7382e99c5353c4cdb
parent 5d46260664104a5a510991cddfaa6539e89c1a53
author Jean-Baptiste Queru <jbq@google.com> 1330390626 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330390626 -0800

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

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