veliymolfar 28df8d4f77 Merge remote-tracking branch 'origin/master' into configure_menu_items ... # Conflicts: # OsmAnd/src/net/osmand/plus/ContextMenuItem.java		2020-04-08 17:10:49 +03:00
..
aidlapi	Merge remote-tracking branch 'origin/master' into configure_menu_items	2020-04-08 17:10:49 +03:00