merge heads

This commit is contained in:
Jimmy Shih
2012-04-02 14:49:12 -07:00
parent 0bd4461c32
commit 2d05ff98ca
75 changed files with 783 additions and 794 deletions
+2 -2
View File
@@ -54,7 +54,7 @@ limitations under the License.
style="@style/WidgetTextView"
android:text="@string/stat_total_distance" />
</LinearLayout>
<ImageView
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="1dp"
android:background="@color/appwidget_hr" />
@@ -70,7 +70,7 @@ limitations under the License.
style="@style/WidgetTextView"
android:text="@string/stat_moving_time" />
</LinearLayout>
<ImageView
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="1dp"
android:background="@color/appwidget_hr" />