Merge pull request #5261 from apavlenko:android_ocl_sample_improvements
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 31 Aug 2015 11:09:40 +0000 (11:09 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 31 Aug 2015 11:09:41 +0000 (11:09 +0000)

Trivial merge