Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-03-28 10:36:24 +01:00
commit a09cab1538

View file

@ -103,7 +103,7 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
pref.setTitle(R.string.agps_info); pref.setTitle(R.string.agps_info);
if (agpsLastDonwloaded != null) { if (agpsLastDonwloaded != null) {
SimpleDateFormat prt = new SimpleDateFormat("yyyy-MM-dd HH:mm"); SimpleDateFormat prt = new SimpleDateFormat("yyyy-MM-dd HH:mm");
pref.setSummary(getString(R.string.agps_data_last_downloaded, prt.format(agpsLastDonwloaded)))); pref.setSummary(getString(R.string.agps_data_last_downloaded, prt.format(agpsLastDonwloaded)));
} else { } else {
pref.setSummary(getString(R.string.agps_data_last_downloaded, "null", pref.setSummary(getString(R.string.agps_data_last_downloaded, "null",
"null")); "null"));