Merge pull request #1070 from Daniil-Osokin:calibrationSampleAndroid
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 30 Jul 2013 13:56:01 +0000 (17:56 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 30 Jul 2013 13:56:01 +0000 (17:56 +0400)

Trivial merge