Merge pull request #2231 from asmorkalov:android_toolchain_update
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 30 Jan 2014 09:22:10 +0000 (13:22 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 30 Jan 2014 09:22:11 +0000 (13:22 +0400)

Trivial merge