tree cceebd4d63d39afd3507f3aa1397dd9905403120
parent 4d84f47e734a6904ef9b96a851701a615aacb039
parent 9215ea4cd8bc5f9c9770c5c34a009dc7c6068f86
author Andreas Huber <andih@google.com> 1315862605 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1315862605 -0700

am 7fc8f515: Merge "Turn an another assertion into a runtime error in ACodec\'s implementation"

* commit '7fc8f515a0add6837d525b4f2b4baa7ebe37fc7f':
  Turn an another assertion into a runtime error in ACodec's implementation