Merge pull request #3528 from ilya-lavrenov:update_android_cmake
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 22 Dec 2014 10:22:19 +0000 (10:22 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 22 Dec 2014 10:22:20 +0000 (10:22 +0000)

Trivial merge