Chumva c0befa533f Merge branch 'master' of ssh://github.com/osmandapp/Osmand into TelegramAidlUpdate ... # Conflicts: # OsmAnd/src/net/osmand/aidl/IOsmAndAidlInterface.aidl # OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java # OsmAnd/src/net/osmand/aidl/OsmandAidlService.java		2018-08-30 18:30:07 +03:00
..
aidl	Merge branch 'master' of ssh://github.com/osmandapp/Osmand into TelegramAidlUpdate	2018-08-30 18:30:07 +03:00
telegram	Add check for active mapActivity and add parameter updateTimeMS	2018-08-30 17:07:54 +03:00
PlatformUtil.java	Telegram - cleanup code	2018-06-11 19:57:33 +03:00