Merge pull request #168 from asmorkalov:android_42_camera_fix
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 21 Nov 2012 10:50:53 +0000 (14:50 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 21 Nov 2012 10:50:53 +0000 (14:50 +0400)

Trivial merge