tree 02c1d705975abd4ce871cb33a7c12e242e868e2f
parent a7f86bf6c2605fc32ddafcd33d5d8d775d549627
parent 6736cca08df84328913962f9a14fafa13a25d390
author Jean-Baptiste Queru <jbq@google.com> 1344456684 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344456684 -0700

am 6736cca0: am 52410be8: Merge "mediacodec: Don\'t suggest calling getOutputFormat() immediately"

* commit '6736cca08df84328913962f9a14fafa13a25d390':
  mediacodec: Don't suggest calling getOutputFormat() immediately