Merge: Fix for Android
authorJean Privat <jean@pryen.org>
Wed, 3 Jun 2015 01:58:38 +0000 (21:58 -0400)
committerJean Privat <jean@pryen.org>
Wed, 3 Jun 2015 01:58:38 +0000 (21:58 -0400)
Pull-Request: #1429
Reviewed-by: Alexandre Terrasa <alexandre@moz-code.org>
Reviewed-by: Lucas Bajolet <r4pass@hotmail.com>
Reviewed-by: Jean Privat <jean@pryen.org>


Trivial merge