Merge: Minor fixes to the Android support
authorJean Privat <jean@pryen.org>
Mon, 4 Aug 2014 14:44:11 +0000 (10:44 -0400)
committerJean Privat <jean@pryen.org>
Mon, 4 Aug 2014 14:44:11 +0000 (10:44 -0400)
Pull-Request: #634
Reviewed-by: Jean Privat <jean@pryen.org>
Reviewed-by: Alexandre Terrasa <alexandre@moz-code.org>


Trivial merge