Files
moonlight-android/app/src/main/java
Cameron Gutman 1965cc2347 Merge branch 'NewUI-prepare-for-translation' into NewUI
Conflicts:
	app/src/main/java/com/limelight/PcView.java
2014-11-13 21:30:11 -08:00
..