Skalii 7f395a612a Merge remote-tracking branch 'origin/master' into trip_recording_process ... # Conflicts: # OsmAnd/res/values/strings.xml # OsmAnd/src/net/osmand/plus/track/GpxBlockStatisticsBuilder.java		2021-02-10 15:40:50 +02:00
..
res/values
src/net/osmand/aidlapi	Merge remote-tracking branch 'origin/master' into trip_recording_process	2021-02-10 15:40:50 +02:00
.gitignore
AndroidManifest.xml	Change manifest package	2019-10-11 14:24:08 +03:00
build.gradle	Add ivy repo	2021-01-15 14:42:50 +01:00