Merge: Misc commits to android, json::dynamic and more_collections
authorJean Privat <jean@pryen.org>
Thu, 19 Feb 2015 01:53:28 +0000 (08:53 +0700)
committerJean Privat <jean@pryen.org>
Thu, 19 Feb 2015 01:53:28 +0000 (08:53 +0700)
The gamepad events are based on 2 different gamepads. They will probably need to be revisited with different layouts.

Pull-Request: #1163
Reviewed-by: Alexandre Terrasa <alexandre@moz-code.org>
Reviewed-by: Lucas Bajolet <r4pass@hotmail.com>


Trivial merge