Merge pull request #3592 from jet47:cuda-7.0-android
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 13 Jan 2015 11:18:20 +0000 (11:18 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 13 Jan 2015 11:18:20 +0000 (11:18 +0000)

Trivial merge