am 6aacad66: Merge "Add some encoding parameters for the "record" utility" into gingerbread

Merge commit '6aacad66eba2b51251f7e2dfb8c005b5242326ca' into gingerbread-plus-aosp

* commit '6aacad66eba2b51251f7e2dfb8c005b5242326ca':
  Add some encoding parameters for the "record" utility
tree: 9d5696650439c076cb0c585bc39314689cde9be3
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/