Merge pull request #1854 from asmorkalov:android_engine_tegra4i5
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 22 Nov 2013 14:15:48 +0000 (18:15 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 22 Nov 2013 14:15:49 +0000 (18:15 +0400)

Trivial merge