tree 0eea8c5963e03d35f60c1df623e818d40963952b
parent a8fd9374ed1c1292ca2b5f767e8c7d8550125d50
parent ca901d984da3cb39fca84940eb0caad293a205b4
author James Dong <jdong@google.com> 1281644059 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281644059 -0700

am 708ec39c: Don\'t send late frames to software encoders for encoding

Merge commit '708ec39c21568e0c2aa3d20c681f0e14ee6134ad' into gingerbread-plus-aosp

* commit '708ec39c21568e0c2aa3d20c681f0e14ee6134ad':
  Don't send late frames to software encoders for encoding