merge heads

2011-11-10 16:51:10 -08:00
parent 44e81383f9
commit 23b5f879ae
34 changed files with 378 additions and 473 deletions
@@ -59,7 +59,7 @@ services.
      android:id="@+id/send_to_google_result_error"
      android:layout_width="fill_parent"
      android:layout_height="wrap_content"
-      android:text="@string/error_generic"
+      android:text="@string/error_sending_to_google"
      android:visibility="gone"
      style="?android:attr/textAppearanceLarge"/>
 </LinearLayout>