Merge remote-tracking branch 'origin/aidl_new_method' into aidl_new_method

Browse source

# Conflicts:
#	OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java

...

This commit is contained in:

madwasp79 2019-04-17 18:16:02 +03:00

parent 39e5534072 6df0ffe005

commit 2ae02121c7

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available