Merge "Preventing aggregation suggestions from showing up on rotation"
diff --git a/src/com/android/contacts/editor/LabeledEditorView.java b/src/com/android/contacts/editor/LabeledEditorView.java
index 0c5001e..9331acb 100644
--- a/src/com/android/contacts/editor/LabeledEditorView.java
+++ b/src/com/android/contacts/editor/LabeledEditorView.java
@@ -35,6 +35,7 @@
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.Handler;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -279,6 +280,11 @@
     /** {@inheritDoc} */
     @Override
     public void onFieldChanged(String column, String value) {
+        String oldValue = mEntry.getAsString(column);
+        if (oldValue == null && value.equals("") || oldValue != null && oldValue.equals(value)) {
+            return;
+        }
+
         // Field changes are saved directly
         mEntry.put(column, value);
         if (mListener != null) {