Merge pull request #2514 from asmorkalov:android_two_libs_cuda
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 24 Mar 2014 08:26:57 +0000 (12:26 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 24 Mar 2014 08:26:57 +0000 (12:26 +0400)

Trivial merge