Merge pull request #2501 from asmorkalov:android_native_camera_qualcomm
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 21 Mar 2014 12:28:47 +0000 (16:28 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 21 Mar 2014 12:28:48 +0000 (16:28 +0400)

Trivial merge