Merge pull request #2069 from asmorkalov:android_ocl_1_1_fix
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 26 Dec 2013 19:07:24 +0000 (23:07 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 26 Dec 2013 19:07:25 +0000 (23:07 +0400)

Trivial merge