madwasp79 ed50f6a3a8 Merge branch 'master' into issue_7076 ... # Conflicts: # OsmAnd/res/values/strings.xml		2019-06-27 15:25:45 +03:00
..
java	Merge branch 'master' into issue_7076	2019-06-27 15:25:45 +03:00