Merge branch 'master' into 4k

Conflicts:
	app/build.gradle
	app/libs/limelight-common.jar
This commit is contained in:
Cameron Gutman committed 2015-11-11 17:36:08 -08:00
commit d199c1b6c4
4 files changed
+2 -4

No files matched your search

+1
View File
@@ -11,6 +11,7 @@
<uses-feature android:name="android.hardware.touchscreen" android:required="false" />
<uses-feature android:name="android.hardware.wifi" android:required="false" />
<uses-feature android:name="android.hardware.gamepad" android:required="false" />
<uses-feature android:name="android.hardware.usb.host" android:required="false" />
<application
android:allowBackup="true"