tree d36afd7c973196e937c8391433272ce401445199
parent 4de258b6306af9a15d6e640736b1a4a72dc1cffe
parent 0f1c0ec93b1bd700cac0c7c9acd5483e4d8971cf
author James Dong <jdong@google.com> 1281472360 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281472360 -0700

am b9ddd779: am 10ed3f74: Merge "Add input buffer size check for software video encoders" into gingerbread

Merge commit 'b9ddd779ae547b020764b89a0cbd96d589717609'

* commit 'b9ddd779ae547b020764b89a0cbd96d589717609':
  Add input buffer size check for software video encoders