merge heads

2012-05-01 18:05:53 -07:00
parent 52253afd3a
commit 66ba54ffa0
113 changed files with 1122 additions and 1956 deletions
@@ -18,11 +18,8 @@ limitations under the License.
  android:layout_height="fill_parent"
  android:layout_width="fill_parent"
  android:orientation="vertical" >
-  <ScrollView
-    android:layout_height="0dp"
-    android:layout_weight="1"
-    android:layout_width="fill_parent" >
-    <include layout="@layout/welcome" />
+  <ScrollView style="@style/ScrollView.WithBottomButtons" >
+    <include layout="@layout/help_content" />
  </ScrollView>
  <LinearLayout style="@style/BottomButtonBar" >
    <include layout="@layout/help_buttons" />