Merge: Minor tweaks and fixes for Android
authorJean Privat <jean@pryen.org>
Thu, 25 Feb 2016 14:02:13 +0000 (09:02 -0500)
committerJean Privat <jean@pryen.org>
Thu, 25 Feb 2016 14:02:13 +0000 (09:02 -0500)
commit35d1de84d20cb5cf7869c8663d164e512d243ed3
tree001e65f576e0da6c1ef6c1ee051a67cd3fd2ff69
parentd2abbeeac42288ce2bbd2afcd0f04fd4cebe1629
parented78509a7b02139827c54297d23001e9d13fb5d2
Merge: Minor tweaks and fixes for Android

Pull-Request: #1957
Reviewed-by: Jean Privat <jean@pryen.org>