merge heads

2011-11-04 13:52:32 -07:00
parent d09218ca97 cc06c469ee
commit 8dd2ebd245
17 changed files with 456 additions and 157 deletions
@@ -108,7 +108,7 @@ public class SettingsActivity extends PreferenceActivity {
      announcementFrequency.setEnabled(false);
      announcementFrequency.setValue("-1");
      announcementFrequency.setSummary(
-          R.string.settings_not_available_summary);
+          R.string.settings_announcement_frequency_not_available);
    }
  }