merge heads

2011-11-10 16:08:35 -08:00
parent 7915202aaa 2062ee7dfc
commit c573301b2d
31 changed files with 286 additions and 471 deletions
@@ -18,8 +18,7 @@ limitations under the License.
  xmlns:android="http://schemas.android.com/apk/res/android">

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