tree 8296d4324fdbe3cb4ca94b4cc183b6aab2872c31
parent 89e275dc833aadb90dd12bdb5dc7e93775a625be
parent dbb74f4ee1a971da71f26739d870fc9334100499
author Andreas Huber <andih@google.com> 1352922691 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352922691 -0800

am dbb74f4e: am f0937247: Merge "Properly signal an error if codec configuration goes wrong." into jb-mr1.1-dev

* commit 'dbb74f4ee1a971da71f26739d870fc9334100499':
  Properly signal an error if codec configuration goes wrong.