Merge pull request #1906 from asmorkalov:android_ocl_warn_fix
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 3 Dec 2013 07:20:48 +0000 (11:20 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 3 Dec 2013 07:20:48 +0000 (11:20 +0400)

Trivial merge