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
tree: 4a7dc01920b8eb7e82603ff465c91c848af176c0
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/