merge heads

2013-11-20 10:36:47 -08:00
parent 45909e70b6
commit 63c1330f50
68 changed files with 1487 additions and 1176 deletions
@@ -19,9 +19,7 @@ limitations under the License.
  <LinearLayout
    android:layout_height="wrap_content"
    android:layout_width="match_parent"
-    android:orientation="vertical"
-    android:paddingLeft="8dp"
-    android:paddingRight="8dp" >
+    android:orientation="vertical">
    <include layout="@layout/stats_content" />
  </LinearLayout>
 </ScrollView>