Dmitriy Ruban 06ac9d7baf Merge remote-tracking branch 'origin/master' into Widget_for_Tracker_in_OsmAnd ... # Conflicts: # OsmAnd-telegram/res/values/strings.xml		2020-01-03 14:58:32 +02:00
..
attrs.xml	remove unnecessary call to editDate	2018-08-08 11:44:54 +03:00
colors.xml	Live track settings initial commit	2019-07-15 15:09:29 +03:00
dimens.xml	Add set time dialog and improve userGpxInfo fragment	2019-07-24 15:19:17 +03:00
fonts.xml	Make fonts titles not translatable	2018-10-19 13:54:27 +03:00
strings.xml	Merge remote-tracking branch 'origin/master' into Widget_for_Tracker_in_OsmAnd	2020-01-03 14:58:32 +02:00
styles.xml	fix status bar transparent color	2018-08-23 15:03:59 +03:00