Merge branch 'android_branch' into android_translate

This commit is contained in:
Eric House 2015-08-11 07:31:06 -07:00
commit 49e2503146

View file

@ -35,7 +35,7 @@ public class XWApp extends Application {
public static final boolean BTSUPPORTED = true;
public static final boolean SMSSUPPORTED = true;
public static final boolean GCMSUPPORTED = true;
public static final boolean ATTACH_SUPPORTED = true;
public static final boolean ATTACH_SUPPORTED = false;
public static final boolean REMATCH_SUPPORTED = false;
public static final boolean DEBUG_LOCKS = false;
public static final boolean LOG_LIFECYLE = false;