Cameron Gutman a301575dd7 Merge branch 'master' into 4k
Conflicts:
	app/build.gradle
	app/src/main/java/com/limelight/preferences/PreferenceConfiguration.java
2015-11-08 19:08:13 -08:00
..
2015-04-21 21:50:40 -04:00
2015-04-21 21:50:40 -04:00
2015-04-21 21:50:40 -04:00
2015-04-21 21:50:40 -04:00
2015-04-21 21:50:40 -04:00
2015-02-27 01:43:24 -05:00
2015-11-08 19:08:13 -08:00
2015-10-23 13:52:09 -07:00
2014-11-16 14:23:58 -08:00
2015-11-08 19:08:13 -08:00