Eric House 68f72451cd Merge remote-tracking branch 'weblate/android_translate' into android_translate ... # 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-04 19:48:58 -07:00
..
strings.xml	Merge remote-tracking branch 'weblate/android_translate' into android_translate	2015-08-04 19:48:58 -07:00