Eric House ec581d1dbd Merge branch 'android_branch' into relay_noconn ... Conflicts: xwords4/android/XWords4/archive/R.java xwords4/android/XWords4/jni/Android.mk xwords4/android/XWords4/jni/xwjni.c xwords4/android/XWords4/res/values/common_rsrc.xml		2015-08-04 20:17:56 -07:00
..
values-ba_CK	change button text to Wait (per Kati)	2015-07-30 06:36:47 -07:00
values-ca	copy over from android_translate branch	2015-08-04 20:13:19 -07:00
values-ca_PS	change button text to Wait (per Kati)	2015-07-30 06:36:47 -07:00
values-cs	use android's build-in OK and Cancel strings	2015-05-27 07:05:59 -07:00
values-fr	funnel invitation notifications from all three channels into same	2015-07-11 15:47:35 -07:00
values-pt	funnel invitation notifications from all three channels into same	2015-07-11 15:47:35 -07:00
values-sk	funnel invitation notifications from all three channels into same	2015-07-11 15:47:35 -07:00