xwords/xwords4/android/XWords4/res/xml
Eric House 716109e979 Merge branch 'android_branch' into android_localize
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsActivity.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java
2014-04-26 22:04:57 -07:00
..
xwprefs.xml Merge branch 'android_branch' into android_localize 2014-04-26 22:04:57 -07:00