Merge pull request #2542 from asmorkalov:android_javacam_cvtcolor_fix
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 28 Mar 2014 08:45:39 +0000 (12:45 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 28 Mar 2014 08:45:39 +0000 (12:45 +0400)

Trivial merge