Merge pull request #794 from asmorkalov:android_no_layout
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 11 Apr 2013 07:34:42 +0000 (11:34 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 11 Apr 2013 07:34:42 +0000 (11:34 +0400)

Trivial merge