Eric House b7694b67d2 Merge branch 'android_branch' into android_dualpane2. Compiles after a ton of conflict resolution and some file removal. No idea if it runs, but little confidence. ... Conflicts: xwords4/android/XWords4/.gitignore xwords4/android/XWords4/archive/R.java xwords4/android/XWords4/res/values/strings.xml xwords4/android/XWords4/res/values/styles.xml xwords4/android/XWords4/res_src/values-ba_CK/strings.xml xwords4/android/XWords4/res_src/values-ca_PS/strings.xml xwords4/android/XWords4/src/org/eehouse/android/xw4/BTInviteDelegate.java xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java xwords4/android/XWords4/src/org/eehouse/android/xw4/DelegateBase.java xwords4/android/XWords4/src/org/eehouse/android/xw4/Delegator.java xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java xwords4/android/XWords4/src/org/eehouse/android/xw4/DwnldDelegate.java xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigDelegate.java xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListActivity.java xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegate.java xwords4/android/XWords4/src/org/eehouse/android/xw4/InviteDelegate.java xwords4/android/XWords4/src/org/eehouse/android/xw4/ListDelegateBase.java xwords4/android/XWords4/src/org/eehouse/android/xw4/MultiService.java xwords4/android/XWords4/src/org/eehouse/android/xw4/NewGameDelegate.java xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsDelegate.java xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayGameDelegate.java xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSInviteDelegate.java xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java xwords4/android/XWords4/src/org/eehouse/android/xw4/StudyListDelegate.java xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListActivity.java xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocItemEditDelegate.java xwords4/android/scripts/adb-install.sh xwords4/android/scripts/find-and-ant.sh		2016-03-11 22:19:37 -08:00
..
values-ba_CK	in search of why some game summaries never load: show a different	2016-03-04 08:34:47 -08:00
values-ca	remove unused string	2016-01-23 22:09:40 -08:00
values-ca_PS	in search of why some game summaries never load: show a different	2016-03-04 08:34:47 -08:00
values-cs	Translated using Weblate (Czech)	2015-10-19 09:44:12 +02:00
values-fr	Merge branch 'android_translate' of git://git.weblate.org/xwords into android_translate	2016-01-29 06:00:56 -08:00
values-ja	Translated using Weblate (Japanese)	2016-02-05 12:57:57 +01:00
values-nl	remove unused string	2016-01-23 22:09:40 -08:00
values-pt	Merge remote-tracking branch 'origin/android_translate' into android_translate	2016-01-07 19:17:25 +01:00
values-sk	remove unused string	2016-01-23 22:09:40 -08:00