Merge pull request #854 from asmorkalov:android_null_invalid_cam
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 30 Apr 2013 13:36:39 +0000 (17:36 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 30 Apr 2013 13:36:39 +0000 (17:36 +0400)

Trivial merge