am aa40b834: am 6aacad66: Merge "Add some encoding parameters for the "record"...
am aa40b834: am 6aacad66: Merge "Add some encoding parameters for the "record" utility" into gingerbread
Merge commit 'aa40b834'
* commit 'aa40b834':
Add some encoding parameters for the "record" utility