Merge pull request #1242 from asmorkalov:android_native_cam
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 12 Aug 2013 10:47:48 +0000 (14:47 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 12 Aug 2013 10:47:48 +0000 (14:47 +0400)

Trivial merge