auto import from //branches/cupcake/...@137197

Android.mk

@@ -15,8 +15,6 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_MODULE_TAGS := eng development
-
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := Email

res/values/strings.xml

@@ -181,6 +181,13 @@
     <string name="message_discarded_toast">Message discarded.</string>
     <!-- Toast shown briefly while saving a draft -->
     <string name="message_saved_toast">Message saved as draft.</string>
+    <!-- Dialog title when prompting before creating a contact from incoming email -->
+    <string name="add_contact_dlg_title">Add Contact</string>
+    <!-- Dialog message when prompting before creating a contact from incoming email.  Includes
+         the email address, e.g. "Add xyz@foo.com to contacts" -->
+    <string name="add_contact_dlg_message_fmt">Add \"<xliff:g id="email">%s</xliff:g>\" to contacts
+        </string>
+
     <!-- Title of screen when setting up new email account -->
     <string name="account_setup_basics_title">Set up email</string>
     <!-- On "Set up email" screen, brief instructions -->

tests/src/com/android/email/activity/MessageViewTests.java

@@ -26,6 +26,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.suitebuilder.annotation.MediumTest;
+import android.test.suitebuilder.annotation.Suppress;
 import android.view.MenuItem;
 import android.webkit.WebView;
 import android.widget.TextView;
@@ -112,6 +113,7 @@ public class MessageViewTests
      * Tests that various UI calls can be made safely even before the messaging controller
      * has completed loading the message.  This catches various race conditions.
      */
+    @Suppress
     public void testUiRaceConditions() {
         
         MessageView a = getActivity();