Merge remote-tracking branch 'origin/open_GPX' into open_GPX
# Conflicts: # OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
This commit is contained in:
commit
d088df6a77
# Conflicts: # OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java