Merge "Compile with javac by default" am: 262d597530 am: 6d6e0f7c75
am: ec20a71b46

Change-Id: If2dfb91709f8bdab7dc3e7634a7001d78de66e2d
diff --git a/core/combo/javac.mk b/core/combo/javac.mk
index 36ac2aa..64025e3 100644
--- a/core/combo/javac.mk
+++ b/core/combo/javac.mk
@@ -11,7 +11,7 @@
 
 ifndef ANDROID_COMPILE_WITH_JACK
 # Defines if compilation with jack is enabled by default.
-ANDROID_COMPILE_WITH_JACK := true
+ANDROID_COMPILE_WITH_JACK := false
 endif
 
 common_jdk_flags := -Xmaxerrs 9999999