Merge pull request #662 from asmorkalov:android_native_activity
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 21 Mar 2013 10:47:13 +0000 (14:47 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 21 Mar 2013 10:47:14 +0000 (14:47 +0400)

Trivial merge