Merge pull request #3495 from taka-no-me:fix_android_arm64
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 9 Dec 2014 14:12:22 +0000 (14:12 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 9 Dec 2014 14:12:22 +0000 (14:12 +0000)

Trivial merge