diff options
| author | Tadashi G. Takaoka <takaoka@google.com> | 2013-03-19 10:48:10 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2013-03-19 10:48:10 +0900 |
| commit | 841c295f3c99214f45924434d9c0bb5b4760578d (patch) | |
| tree | 62226e13d2674b0e99e0d49a899aa30ab6b5eb91 /java/src/com/android/inputmethod/research/LogUnit.java | |
| parent | bbadc6ed2f8a74214bcc328c7b4d7f9bb55d6ef0 (diff) | |
| parent | 5b048292540b6fbbd8929a3622262f352245d464 (diff) | |
resolved conflicts for merge of 5b048292 to master
Change-Id: I67ebab46954cd7b8e3e79e7fed523bafb15f8835
Diffstat (limited to 'java/src/com/android/inputmethod/research/LogUnit.java')
| -rw-r--r-- | java/src/com/android/inputmethod/research/LogUnit.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/research/LogUnit.java b/java/src/com/android/inputmethod/research/LogUnit.java index 61b6df0f4..1c01675bd 100644 --- a/java/src/com/android/inputmethod/research/LogUnit.java +++ b/java/src/com/android/inputmethod/research/LogUnit.java @@ -46,7 +46,8 @@ import java.util.List; */ public class LogUnit { private static final String TAG = LogUnit.class.getSimpleName(); - private static final boolean DEBUG = false && ProductionFlag.IS_EXPERIMENTAL_DEBUG; + private static final boolean DEBUG = false + && ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS_DEBUG; private final ArrayList<LogStatement> mLogStatementList; private final ArrayList<Object[]> mValuesList; |