Eric House 592f01a767 Merge branch 'android_branch' into relay_noconn ... # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.		2015-08-17 07:07:59 -07:00
..
values-ba_CK	return count of messages sent from comms_resendAll(), and post it as a	2015-08-13 07:05:06 -07:00
values-ca	copy over new translations from translation branch.	2015-08-17 07:04:10 -07:00
values-ca_PS	return count of messages sent from comms_resendAll(), and post it as a	2015-08-13 07:05:06 -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-nl	copy over new translations from translation branch.	2015-08-17 07:04:10 -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