merge heads

This commit is contained in:
Jimmy Shih
2011-11-15 16:43:45 -08:00
parent 999285fcbc
commit ae28dc01fe
99 changed files with 4799 additions and 10962 deletions
+3 -3
View File
@@ -52,7 +52,7 @@ limitations under the License.
android:id="@+id/appwidget_distance_text" />
<TextView
style="@style/WidgetText"
android:text="@string/total_distance_label" />
android:text="@string/stat_total_distance" />
</LinearLayout>
<ImageView
android:layout_width="fill_parent"
@@ -68,7 +68,7 @@ limitations under the License.
android:id="@+id/appwidget_time_text" />
<TextView
style="@style/WidgetText"
android:text="@string/moving_time_label" />
android:text="@string/stat_moving_time" />
</LinearLayout>
<ImageView
android:layout_width="fill_parent"
@@ -83,7 +83,7 @@ limitations under the License.
android:id="@+id/appwidget_speed_text" />
<TextView
style="@style/WidgetText"
android:text="@string/speed" />
android:text="@string/stat_speed" />
</LinearLayout>
</LinearLayout>
</LinearLayout>