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)
commit16f0634427ea69f7569fb718b4b8c99977b46b51
tree0adcad2837d4bd61f17aa3b0c1378cc0a6192db9
parente8ce370eb3f8b7857783e3a028799542de57f00d
parentc1c525076f5b35e3faa28509a7f96339173d749e
Merge: Fix for Android

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>