tree 6295b7d45369a6b42bc3885d39dbd3f7c706bf90
parent bd1578fb682ea9dbbab10f88165a9edf72e8b063
parent d3c9fce36caa3991b2bc035ab80f92e110b0c0b3
author James Dong <jdong@google.com> 1285094240 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285094240 -0700

am d3c9fce3: Merge "Allow record to set input color format as a command line option" into gingerbread

Merge commit 'd3c9fce36caa3991b2bc035ab80f92e110b0c0b3' into gingerbread-plus-aosp

* commit 'd3c9fce36caa3991b2bc035ab80f92e110b0c0b3':
  Allow record to set input color format as a command line option