Merge pull request #2504 from asmorkalov:android_camera_locks_24
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 24 Mar 2014 08:06:50 +0000 (12:06 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 24 Mar 2014 08:06:51 +0000 (12:06 +0400)

Trivial merge