Merge pull request #759 from asmorkalov:android_common_fixes
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 4 Apr 2013 13:58:44 +0000 (17:58 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 4 Apr 2013 13:58:44 +0000 (17:58 +0400)

Trivial merge