tree 7f22340636bbd52f3e09109779cc2020a5b650c4
parent 573c5d5edc1f51fd026e1d0e17ab883403eeddd9
parent d353c840ad5bf1b4e6bfba0e10bcdc79223bcdf7
author James Dong <jdong@google.com> 1283993668 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283993668 -0700

am d353c840: Merge "HW audio encoder expects timestamp via kKeyTime from each input buffer" into gingerbread

Merge commit 'd353c840ad5bf1b4e6bfba0e10bcdc79223bcdf7' into gingerbread-plus-aosp

* commit 'd353c840ad5bf1b4e6bfba0e10bcdc79223bcdf7':
  HW audio encoder expects timestamp via kKeyTime from each input buffer