Merge branch 'fix_androidcamera_preview_usage_bits' into 2.4
authorAlexander Smorkalov <alexander.smorkalov@itseez.com>
Wed, 30 Jul 2014 10:35:00 +0000 (14:35 +0400)
committerAlexander Smorkalov <alexander.smorkalov@itseez.com>
Wed, 30 Jul 2014 10:35:00 +0000 (14:35 +0400)

Trivial merge