Merge branch 'contact_settings' into setup_app_name

This commit is contained in:
masensio 2013-10-22 13:02:41 +02:00
commit 865940064d

View file

@ -49,7 +49,7 @@
<Preference android:title="@string/prefs_help" android:key="help" /> <Preference android:title="@string/prefs_help" android:key="help" />
<Preference android:title="@string/prefs_recommend" android:key="recommend" /> <Preference android:title="@string/prefs_recommend" android:key="recommend" />
<Preference android:title="@string/prefs_feedback" android:key="feedback" /> <Preference android:title="@string/prefs_feedback" android:key="feedback" />
<!-- Preference android:title="@string/prefs_imprint" android:key="imprint" / --> <Preference android:title="@string/prefs_imprint" android:key="imprint" />
<Preference android:id="@+id/about_app" <Preference android:id="@+id/about_app"
android:title="@string/about_title" android:title="@string/about_title"