merge heads

2011-11-15 16:43:45 -08:00
parent 999285fcbc
commit ae28dc01fe
99 changed files with 4799 additions and 10962 deletions
@@ -28,7 +28,7 @@ limitations under the License.
    <LinearLayout style="@style/ButtonSpacer"/>
    <Button android:id="@+id/welcome_ok"
      android:layout_gravity="left"
-      android:text="@string/ok"
+      android:text="@string/generic_ok"
      style="@style/Button"/>
    <Button android:id="@+id/welcome_about"
      android:layout_gravity="right"