Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3667b9b4 authored by Fred Quintana's avatar Fred Quintana Committed by Android Git Automerger
Browse files

am 30ed25c2: Merge "revert the stripping of System Group: from the names of... 

am 30ed25c2: Merge "revert the stripping of System Group: from the names of google system groups" into froyo

Merge commit '30ed25c2' into froyo-plus-aosp

* commit '30ed25c2':
  revert the stripping of System Group:
parents f5071884 30ed25c2

core/java/android/pim/vcard/VCardEntry.java

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public class VCardEntry { 
    private final static int DEFAULT_ORGANIZATION_TYPE = Organization.TYPE_WORK;



    private static final String ACCOUNT_TYPE_GOOGLE = "com.google";

    private static final String GOOGLE_MY_CONTACTS_GROUP = "My Contacts";

    private static final String GOOGLE_MY_CONTACTS_GROUP = "System Group: My Contacts";



    private static final Map<String, Integer> sImMap = new HashMap<String, Integer>();