Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into lock_screen
# Conflicts: # OsmAnd/res/values/strings.xml
- Loading branch information