xwords/xwords4/android/XWords4/archive
Eric House 5cece9f3cc Merge remote-tracking branch 'sf/android_branch' into android_multi2
Conflicts:
	xwords4/android/XWords4/archive/R.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
2015-01-27 07:53:42 -08:00
..
R.java Merge remote-tracking branch 'sf/android_branch' into android_multi2 2015-01-27 07:53:42 -08:00