Merge "Remove duplicate definition of assistant screen type" into oc-dev
am: 3d900b3476

Change-Id: If234609eb02579a4cac4718e1670f374e3818593
diff --git a/src/com/android/contacts/logging/ScreenEvent.java b/src/com/android/contacts/logging/ScreenEvent.java
index 2df2760..bdea66d 100644
--- a/src/com/android/contacts/logging/ScreenEvent.java
+++ b/src/com/android/contacts/logging/ScreenEvent.java
@@ -31,10 +31,8 @@
         public static final int ALL_CONTACTS = 4;
         public static final int QUICK_CONTACT = 5;
         public static final int EDITOR = 6;
-        public static final int FIND_DUPLICATES = 7;
         public static final int LIST_ACCOUNT = 8;
         public static final int LIST_GROUP = 9;
         public static final int ME_CONTACT = 10;
-        public static final int ASSISTANT = 11;
     }
 }