tree 8347e9db22517c64ed68edbf5a2ed587d916193a
parent 8872633927679cfeb77948ba7b562e07e899ef91
parent 5257d874dd68bf67b75c316f44e32e18ede0b469
author James Dong <jdong@google.com> 1285262901 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285262901 -0700

am 693a430c: am 903fc221: Ignore errors from correction parameter query and config for M4v and H263 encoders

Merge commit '693a430cff3c9fac503b5005e9fd5419611eddde'

* commit '693a430cff3c9fac503b5005e9fd5419611eddde':
  Ignore errors from correction parameter query and config for M4v and H263 encoders