Merge pull request #6942 from alalek:fix_android_pack
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 21 Jul 2016 07:30:15 +0000 (07:30 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 21 Jul 2016 07:30:15 +0000 (07:30 +0000)

Trivial merge