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
..
calculateroute
contextmenu
copyfile	Migration to AndroidX	2020-03-04 16:12:06 +02:00
customization	Migration to AndroidX	2020-03-04 16:12:06 +02:00
favorite
gpx	Migration to AndroidX	2020-03-04 16:12:06 +02:00
map
maplayer
mapmarker
mapwidget
navdrawer	Migration to AndroidX	2020-03-04 16:12:06 +02:00
navigation
note
plugins
search
tiles	Migration to AndroidX	2020-03-04 16:12:06 +02:00
AidlParams.java
IOsmAndAidlCallback.aidl
IOsmAndAidlInterface.aidl	Add import profile to new aidl api	2019-11-29 17:43:50 +02:00
OsmandAidlConstants.java	Change group name	2019-10-15 12:35:43 +03:00
OsmAndCustomizationConstants.java	Merge remote-tracking branch 'origin/master' into configure_menu_items	2020-04-08 17:10:49 +03:00