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
..
osmand/aidlapi	Merge remote-tracking branch 'origin/master' into trip_recording_process	2021-02-10 15:40:50 +02:00