resolved conflicts for merge of 5b048292 to master

Change-Id: I67ebab46954cd7b8e3e79e7fed523bafb15f8835

1 files changed, 5 insertions, 5 deletions

diff --git a/java/src/com/android/inputmethod/latin/define/ProductionFlag.java b/java/src/com/android/inputmethod/latin/define/ProductionFlag.java
index 3df0d044e..699e47b6a 100644
--- a/java/src/com/android/inputmethod/latin/define/ProductionFlag.java
+++ b/java/src/com/android/inputmethod/latin/define/ProductionFlag.java
@@ -21,12 +21,12 @@ public final class ProductionFlag {
         // This class is not publicly instantiable.
     }
 
-    public static final boolean IS_EXPERIMENTAL = false;
+    public static final boolean USES_DEVELOPMENT_ONLY_DIAGNOSTICS = false;
 
-    // When false, IS_EXPERIMENTAL_DEBUG suggests that all guarded class-private DEBUG flags should
-    // be false, and any privacy controls should be enforced.  IS_EXPERIMENTAL_DEBUG should be false
-    // for any released build.
-    public static final boolean IS_EXPERIMENTAL_DEBUG = false;
+    // When false, USES_DEVELOPMENT_ONLY_DIAGNOSTICS_DEBUG suggests that all guarded
+    // class-private DEBUG flags should be false, and any privacy controls should be enforced.
+    // USES_DEVELOPMENT_ONLY_DIAGNOSTICS must be false for any production build.
+    public static final boolean USES_DEVELOPMENT_ONLY_DIAGNOSTICS_DEBUG = false;
 
     public static final boolean IS_HARDWARE_KEYBOARD_SUPPORTED = true;
 }