Cameron Gutman 1b026f1354 Merge branch 'master' into root
Conflicts:
	AndroidManifest.xml
	src/com/limelight/binding/input/evdev/EvdevWatcher.java
2014-09-20 02:54:15 -07:00
..