merge heads

This commit is contained in:
Jimmy Shih
2011-11-05 12:08:14 -07:00
parent 4e288e4b85
commit c26e63dec3
32 changed files with 1317 additions and 720 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);
}
setMinRecordingIntervalOptions();