Merge pull request #3128 from asmorkalov:android_tegra_optimizations_build_fix
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Thu, 21 Aug 2014 15:48:10 +0000 (15:48 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Thu, 21 Aug 2014 15:48:10 +0000 (15:48 +0000)

Trivial merge