tree 35270c7fa8b79882e9a9c5d122b03c393a858291
parent 4bb0164f8ac26a71113f44b4d482cf8167b5b5ee
parent 647336c76e8da68fb44ca52ec14a8a2c6d5735bb
author Edwin Wong <edwinwong@google.com> 1342227270 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1342227270 -0700

am 647336c7: am e0daeb39: Fixed sample video corrupted in MediaCodec mode.

* commit '647336c76e8da68fb44ca52ec14a8a2c6d5735bb':
  Fixed sample video corrupted in MediaCodec mode.