commit ee7d1fa29c7bbb78012705cab21581995e507843
author Daniel Lehmann <lehmannd@google.com> Thu Aug 05 18:39:29 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 05 18:39:29 2010 -0700
tree a8490cad87a3c0e84db4ba21d91efb3167893a26
parent 9fcf4b162328ccc35a473a1b3c11f4d02ab06bca
parent 60be1a1e8639a58d16f58686f8a89747d6079cc7

Merge "Fix a crash with custom IM protocol"

src/com/android/contacts/util/DataStatus.java

diff --git a/src/com/android/contacts/util/DataStatus.java b/src/com/android/contacts/util/DataStatus.java
index 88c6594..ec3c1e5 100644
--- a/src/com/android/contacts/util/DataStatus.java
+++ b/src/com/android/contacts/util/DataStatus.java
@@ -24,6 +24,8 @@
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 
+import com.android.contacts.R;
+
 /**
  * Storage for a social status update. Holds a single update, but can use
  * {@link #possibleUpdate(Cursor)} to consider updating when a better status
@@ -112,11 +114,11 @@
 
         if (validTimestamp && validLabel) {
             return context.getString(
-                    com.android.internal.R.string.contact_status_update_attribution_with_date,
+                    R.string.contact_status_update_attribution_with_date,
                     timeClause, labelClause);
         } else if (validLabel) {
             return context.getString(
-                    com.android.internal.R.string.contact_status_update_attribution,
+                    R.string.contact_status_update_attribution,
                     labelClause);
         } else if (validTimestamp) {
             return timeClause;