Merge pull request #1073 from asmorkalov:android_cvjavaframe
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 5 Jul 2013 09:41:51 +0000 (13:41 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 5 Jul 2013 09:41:51 +0000 (13:41 +0400)

Trivial merge