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

..

libs

Merge branch 'master' into 4k

2015-10-31 16:46:46 -07:00

src

Merge branch 'master' into 4k

2015-11-08 19:08:13 -08:00

app.iml

Update IML file

2015-10-11 17:11:08 -07:00

build.gradle

Bump version to 3.5-beta3

2015-10-31 18:34:31 -07:00