Merge pull request #2277 from asmorkalov:android_test_path_fix
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 5 Feb 2014 08:36:37 +0000 (12:36 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 5 Feb 2014 08:36:37 +0000 (12:36 +0400)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge