Merge pull request #2321 from asmorkalov:android_run_all_tests
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 12 Feb 2014 11:41:28 +0000 (15:41 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 12 Feb 2014 11:41:29 +0000 (15:41 +0400)

Trivial merge