Eric House be44613773 Merge branch 'android_branch' into relay_noconn ... Conflicts: xwords4/android/XWords4/archive/R.java		2015-08-27 07:53:14 -07:00
..
values-ba_CK	Merge branch 'android_branch' into relay_noconn	2015-08-27 07:53:14 -07:00
values-ca	clean up plurals, adding quantity="one" elements in a few places where	2015-08-27 07:42:16 -07:00
values-ca_PS	Merge branch 'android_branch' into relay_noconn	2015-08-27 07:53:14 -07:00
values-cs	use android's build-in OK and Cancel strings	2015-05-27 07:05:59 -07:00
values-fr	Merge branch 'android_branch' into relay_noconn	2015-08-27 07:53:14 -07:00
values-nl	clean up plurals, adding quantity="one" elements in a few places where	2015-08-27 07:42:16 -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