28df8d4f77
# Conflicts: # OsmAnd/src/net/osmand/plus/ContextMenuItem.java |
||
---|---|---|
.. | ||
res/values | ||
src/net/osmand/aidlapi | ||
.gitignore | ||
AndroidManifest.xml | ||
build.gradle |
28df8d4f77
# Conflicts: # OsmAnd/src/net/osmand/plus/ContextMenuItem.java |
||
---|---|---|
.. | ||
res/values | ||
src/net/osmand/aidlapi | ||
.gitignore | ||
AndroidManifest.xml | ||
build.gradle |