Merge "Don't overwrite different stillshot fourCC in capture start"
authorOllonen, Marko <marko.ollonen@ixonos.com>
Thu, 22 Nov 2012 09:44:11 +0000 (01:44 -0800)
committerGerrit Code Review <gerrit2@tzgerrit>
Thu, 22 Nov 2012 09:44:11 +0000 (01:44 -0800)

Trivial merge