Merge pull request #238 from asmorkalov:android_resolution_sample
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 20 Dec 2012 08:10:57 +0000 (12:10 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 20 Dec 2012 08:10:57 +0000 (12:10 +0400)

Trivial merge