Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-01-01 15:39:56 +01:00
commit 5d48a95863

View file

@ -30,10 +30,10 @@ public class MyLocationMenuController extends MenuController {
return getPointDescription().getTypeName(); return getPointDescription().getTypeName();
} }
// @Override @Override
// public String getCommonTypeStr() { public String getCommonTypeStr() {
// return getMapActivity().getString(R.string.shared_string_location); return getMapActivity().getString(R.string.shared_string_location);
// } }
@Override @Override
public Drawable getLeftIcon() { public Drawable getLeftIcon() {