summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2015-03-25 12:57:30 +0100
committerDanny Baumann <dannybaumann@web.de>2015-03-25 12:57:30 +0100
commit6f680e55f7ebe885da1a68d75630a40162a885b1 (patch)
tree884c8055e5406c3716ad55441ddbd565e98cdde0
parent5ca4bc2cf185babb2356fb0daa13fe95e3dacf15 (diff)
downloadpackages_apps_Contacts-6f680e55f7ebe885da1a68d75630a40162a885b1.tar.gz
packages_apps_Contacts-6f680e55f7ebe885da1a68d75630a40162a885b1.tar.bz2
packages_apps_Contacts-6f680e55f7ebe885da1a68d75630a40162a885b1.zip
Fix merge relicts.
Change-Id: I932ac76cd3e15d34f73d16e015252c3e51d5084b
-rwxr-xr-xsrc/com/android/contacts/editor/RawContactEditorView.java4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/com/android/contacts/editor/RawContactEditorView.java b/src/com/android/contacts/editor/RawContactEditorView.java
index 811753ead..da1c8d963 100755
--- a/src/com/android/contacts/editor/RawContactEditorView.java
+++ b/src/com/android/contacts/editor/RawContactEditorView.java
@@ -400,10 +400,6 @@ public class RawContactEditorView extends BaseRawContactEditorView {
}
}
- if (mGroupMembershipView != null) {
- mFields.addView(mGroupMembershipView);
- }
-
addToDefaultGroupIfNeeded();
}