Cameron Gutman a18aa51f5a Merge branch 'master' into root
Conflicts:
	AndroidManifest.xml
	libs/limelight-common.jar
	res/values/strings.xml
2014-10-17 13:55:45 -07:00
..
2013-09-21 01:04:32 -04:00
2014-10-17 13:55:45 -07:00