commit e4f23ba7449dc25529762716692c7d25f47fbeda
author Walter Jang <wjang@google.com> Mon Sep 26 08:38:23 2016 -0700
committer Walter Jang <wjang@google.com> Mon Sep 26 08:38:23 2016 -0700
tree 98bd8dd9239b647d2fda3193d7fc00094617df28
parent aebf3206766a05cce290245f09506adb789b6e37
parent 996e80f8b429311b0d8099e47716e304bec95d13

resolve merge conflicts of 996e80f to master

Change-Id: I717e5abd94ac57ca94152b90a31e8a2066654f6b

src/com/android/contacts/common/Experiments.java

diff --git a/src/com/android/contacts/common/Experiments.java b/src/com/android/contacts/common/Experiments.java
index 9ddf5b3..2197358 100644
--- a/src/com/android/contacts/common/Experiments.java
+++ b/src/com/android/contacts/common/Experiments.java
@@ -26,6 +26,18 @@
     public static final String CONTACT_SHEET = "QuickContact__contact_sheet";
 
     /**
+     * Flags for maximum content update time
+     */
+    public static final String DYNAMIC_MAX_CONTENT_CHANGE_UPDATE_DELAY_MILLIS =
+            "Shortcuts__dynamic_max_content_change_update_delay_millis";
+
+    /**
+     * Flags for minimum content update time
+     */
+    public static final String DYNAMIC_MIN_CONTENT_CHANGE_UPDATE_DELAY_MILLIS =
+            "Shortcuts__dynamic_min_content_change_update_delay_millis";
+
+    /**
      * Experiment to enable dynamic strequent shortcuts.
      */
     public static final String DYNAMIC_SHORTCUTS = "Shortcuts__dynamic_shortcuts";
@@ -40,17 +52,6 @@
      */
     public static final String SEARCH_YENTA = "Search__yenta";
 
-    /**
-     * Flags for minimum content update time
-     */
-    public static final String DYNAMIC_MIN_CONTENT_CHANGE_UPDATE_DELAY_MILLIS =
-            "Shortcuts__dynamic_min_content_change_update_delay_millis";
-
-    /**
-     * Flags for maximum content update time
-     */
-    public static final String DYNAMIC_MAX_CONTENT_CHANGE_UPDATE_DELAY_MILLIS =
-            "Shortcuts__dynamic_max_content_change_update_delay_millis";
 
     private Experiments() {
     }