merge heads

2011-11-05 12:08:14 -07:00
parent 4e288e4b85
commit c26e63dec3
32 changed files with 1317 additions and 720 deletions
@@ -97,7 +97,7 @@ limitations under the License.
            android:checked="true"
            android:layout_width="fill_parent"
            android:layout_height="wrap_content"
-            android:text="@string/elevation"/>
+            android:text="@string/elevation_label"/>
          <CheckBox android:id="@+id/chart_settings_speed"
            android:checked="true"
            android:layout_width="fill_parent"