Merge pull request #2300 from asmorkalov:android_no_cuda_not_armeabiv7a
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 7 Feb 2014 10:39:08 +0000 (14:39 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 7 Feb 2014 10:39:09 +0000 (14:39 +0400)

Trivial merge