xwords/xwords4/android/XWords4/archive
Eric House 75eb955050 Merge branch 'android_branch' into android_translate
Conflicts:
	xwords4/android/XWords4/archive/R.java
	xwords4/android/XWords4/res/values/strings.xml
	xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
	xwords4/android/XWords4/res_src/values-ca_PS/strings.xml
2015-08-27 07:46:45 -07:00
..
R.java Merge branch 'android_branch' into android_translate 2015-08-27 07:46:45 -07:00