tree 38e26924ada8ae5ba85aefcb948652123c45eb9b
parent 263ebfd8a17266eedc84eb879edb6a6a3395f760
parent 7384baaa82d3ae4375e3d76fc1cc4b7ca1653e18
author James Dong <jdong@google.com> 1282590044 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282590044 -0700

am 177a7ad8: am 439fe407: Merge "Return error from MPEG4Writer stop() if the check on codec specific data failed" into gingerbread

Merge commit '177a7ad825445acaeea38c48c74ad87db935d054'

* commit '177a7ad825445acaeea38c48c74ad87db935d054':
  Return error from MPEG4Writer stop() if the check on codec specific data failed