tree ae5bd9610d447e33a9526499d8f765381b65376d
parent 3478eaa23c19dbbe473be70e8f3cc0c904d2465c
parent 17fa4ab45a87e042a0503356e641fa6ff72ef572
author Jean-Baptiste Queru <jbq@google.com> 1344456672 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344456672 -0700

am 17fa4ab4: am b7ee9c44: Merge "mediacodec: Return an error on getOutputFormat if there is no output format yet"

* commit '17fa4ab45a87e042a0503356e641fa6ff72ef572':
  mediacodec: Return an error on getOutputFormat if there is no output format yet