Merge pull request #4612 from kumpera/android-changes-part2
authorRodrigo Kumpera <kumpera@users.noreply.github.com>
Wed, 5 Apr 2017 23:59:08 +0000 (16:59 -0700)
committerGitHub <noreply@github.com>
Wed, 5 Apr 2017 23:59:08 +0000 (16:59 -0700)
commit8df83179b63e256bcd476d6d7ddbbd50015b81d6
tree64c9b065ccfa01cb410f347078d7e092e1fa16b9
parentef42d89ffc2830ece504dcd050f408905f07af9b
parentce4063f14f4b8adfd804f4127c14b7bef722a1f5
Merge pull request #4612 from kumpera/android-changes-part2

Fix Android compilation and some tests