tree d7f7b57ce9f8e5deeec17dfa66cd65892d479316
parent 6bc542e0f31bcb7ce5ff466c7aa4676f6aa91f7d
parent 94ee1bf232d1f1cc97902dab1e4148eb478cd304
author Jean-Baptiste Queru <jbq@google.com> 1330376836 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330376836 -0800

am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering"

* commit '94ee1bf232d1f1cc97902dab1e4148eb478cd304':
  stagefright amrwbenc: Change keyword ordering