tree 028086af264a1d96a17a8623d823a1923ba12af9
parent e154bdd19d91561549f0d24f54bb10498c02e372
parent c7e64a8e4bd950b615675f7dce0a0f411f568c7e
author Andreas Huber <andih@google.com> 1273774603 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273774603 -0700

am 3c78a1b5: Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.

Merge commit '3c78a1b58957e31d2991fb6a609abecbb1987b3b' into froyo-plus-aosp

* commit '3c78a1b58957e31d2991fb6a609abecbb1987b3b':
  Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.