tree df1bae17d7e2b832d0090a4e775edc0a333b37f4
parent a5a827cace13521126ccf169baacec1d30239ee1
parent f4c873a64db2d5d2d74ca596e7482627dd6b4238
author Marco Nelissen <marcone@google.com> 1366058789 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366058789 -0700

am f4c873a6: Merge "Fix AAC decoder reconfiguration" into jb-mr2-dev

* commit 'f4c873a64db2d5d2d74ca596e7482627dd6b4238':
  Fix AAC decoder reconfiguration