b3466bcf69
Conflicts: OsmAnd/res/values/strings.xml OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java |
||
---|---|---|
.. | ||
libs | ||
src | ||
test-results | ||
.gitignore | ||
build.gradle | ||
collect_legacy_libs.sh | ||
collect_libs.sh | ||
OsmAnd-core-android.jar | ||
OsmAnd-core.jar |