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)
commit0ce5ad837e757966d5c94e0d0e3b6c7628354d1e
tree7398e8df2f00cbce0ea87aa040e59111cc9361c0
parent1d032767b9143171f8e69789d7764c31926f3049
parent9e54cad021b78fff21763635b172c17a6d393a81
Merge: A few Java and Android fixes

Pull-Request: #649
Reviewed-by: Jean Privat <jean@pryen.org>
Reviewed-by: Lucas Bajolet <r4pass@hotmail.com>