merge from main

2011-11-11 12:31:07 -08:00
parent cc4d57bc0c
commit c815579cb9
8 changed files with 949 additions and 355 deletions
@@ -36,7 +36,7 @@ limitations under the License.
      <TextView
        android:layout_height="wrap_content"
        android:layout_width="wrap_content"
-        android:text="@string/about_copyright_message"
+        android:text="@string/about_copyright_notice"
        android:textSize="15sp" />
    </LinearLayout>
  </TableRow>