merge heads

2012-04-02 14:49:12 -07:00
parent 0bd4461c32
commit 2d05ff98ca
75 changed files with 783 additions and 794 deletions
@@ -204,8 +204,6 @@ limitations under the License.
            style="@style/StatsUnit" />
          <TextView
 	          style="@style/StatsDivider" />
-            android:layout_height="3dp"
-            android:layout_width="fill_parent" />
          <TextView
            android:id="@+id/average_moving_speed_unit_label_bottom"
            style="@style/StatsUnit" />