84be1ba7e0
# Conflicts: # OsmAnd-api/src/net/osmand/aidlapi/IOsmAndAidlInterface.aidl |
||
---|---|---|
.. | ||
res/values | ||
src/net/osmand/aidlapi | ||
.gitignore | ||
AndroidManifest.xml | ||
build.gradle |
84be1ba7e0
# Conflicts: # OsmAnd-api/src/net/osmand/aidlapi/IOsmAndAidlInterface.aidl |
||
---|---|---|
.. | ||
res/values | ||
src/net/osmand/aidlapi | ||
.gitignore | ||
AndroidManifest.xml | ||
build.gradle |