Automated merge with http://mytracks.googlecode.com/hg/

2011-09-21 16:17:01 -07:00
parent 6ab1f6158a
commit 4f9b6535fb
6 changed files with 62 additions and 15 deletions
@@ -18,7 +18,8 @@ limitations under the License.
  xmlns:android="http://schemas.android.com/apk/res/android">

  <!-- Display settings -->
-  <PreferenceScreen android:title="@string/settings_display">
+  <PreferenceScreen android:title="@string/settings_display"
+                    android:key="@string/display_settings_screen_key">
    <CheckBoxPreference
        android:key="@string/metric_units_key"
        android:title="@string/settings_metric_units"