tree 1191efdfffad53daa99abaefdbc8adb505764f32
parent 13831586874fab1592a9d6f9134a693b0b27bae8
parent 306cd58ddcc0cb8487bc6e015f8c692eea47a334
author James Dong <jdong@google.com> 1283993876 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283993876 -0700

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

Merge commit '306cd58ddcc0cb8487bc6e015f8c692eea47a334'

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