Merge pull request #2741 from alalek:icv_android
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 19 May 2014 11:04:36 +0000 (15:04 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 19 May 2014 11:04:36 +0000 (15:04 +0400)

Trivial merge