2 Commits

Author SHA1 Message Date
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
Cameron Gutman
bb869a51fd Start using com.limelight.root package name 2014-09-03 23:32:37 -07:00