aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/research/LogStatement.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2013-03-19 10:48:10 +0900
committerTadashi G. Takaoka <takaoka@google.com>2013-03-19 10:48:10 +0900
commit841c295f3c99214f45924434d9c0bb5b4760578d (patch)
tree62226e13d2674b0e99e0d49a899aa30ab6b5eb91 /java/src/com/android/inputmethod/research/LogStatement.java
parentbbadc6ed2f8a74214bcc328c7b4d7f9bb55d6ef0 (diff)
parent5b048292540b6fbbd8929a3622262f352245d464 (diff)
downloadlatinime-841c295f3c99214f45924434d9c0bb5b4760578d.tar.gz
latinime-841c295f3c99214f45924434d9c0bb5b4760578d.tar.xz
latinime-841c295f3c99214f45924434d9c0bb5b4760578d.zip
resolved conflicts for merge of 5b048292 to master
Change-Id: I67ebab46954cd7b8e3e79e7fed523bafb15f8835
Diffstat (limited to 'java/src/com/android/inputmethod/research/LogStatement.java')
-rw-r--r--java/src/com/android/inputmethod/research/LogStatement.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/research/LogStatement.java b/java/src/com/android/inputmethod/research/LogStatement.java
index 09b12fcfa..06b918af5 100644
--- a/java/src/com/android/inputmethod/research/LogStatement.java
+++ b/java/src/com/android/inputmethod/research/LogStatement.java
@@ -37,7 +37,8 @@ import java.io.IOException;
*/
public class LogStatement {
private static final String TAG = LogStatement.class.getSimpleName();
- private static final boolean DEBUG = false && ProductionFlag.IS_EXPERIMENTAL_DEBUG;
+ private static final boolean DEBUG = false
+ && ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS_DEBUG;
// Constants for particular statements
public static final String TYPE_POINTER_TRACKER_CALL_LISTENER_ON_CODE_INPUT =