Merge: A few Java and Android fixes
authorJean Privat <jean@pryen.org>
Thu, 7 Aug 2014 01:23:21 +0000 (21:23 -0400)
committerJean Privat <jean@pryen.org>
Thu, 7 Aug 2014 01:23:21 +0000 (21:23 -0400)
Pull-Request: #649
Reviewed-by: Jean Privat <jean@pryen.org>
Reviewed-by: Lucas Bajolet <r4pass@hotmail.com>


Trivial merge