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

Browse source

# Conflicts:
#	OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java

...

This commit is contained in:

madwasp79 2019-02-06 21:15:21 +02:00

parent d9f9d047d2 d87a094b5a

commit 357e115510

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