Merge "Revert "Import Jack and Jill Douarn 1.3-rc1 as Stable""
diff --git a/tools/jack b/tools/jack
index 0784f56..e04c6e6 100755
--- a/tools/jack
+++ b/tools/jack
@@ -22,7 +22,7 @@
#
# Settings
#
-JACK_VERSION=${JACK_VERSION:=4.26.CANDIDATE}
+JACK_VERSION=${JACK_VERSION:=4.25.BETA}
JACK_HOME="${JACK_HOME:=$HOME/.jack-server}"
JACK_CLIENT_SETTING="${JACK_CLIENT_SETTING:=$HOME/.jack-settings}"
TMPDIR=${TMPDIR:=/tmp}
diff --git a/tools/jack_versions.mk b/tools/jack_versions.mk
index 13f938a..7668767 100644
--- a/tools/jack_versions.mk
+++ b/tools/jack_versions.mk
@@ -18,10 +18,10 @@
jack_jar_tools := $(LOCAL_PATH)/jack-jar-tools.jar
jack_eng_jar := $(LOCAL_PATH)/jacks/jack.jar
-JACK_STABLE_VERSION := 4.26.CANDIDATE
-JACK_DOGFOOD_VERSION := 4.26.CANDIDATE
-JACK_SDKTOOL_VERSION := 4.26.CANDIDATE
-JACK_LANG_DEV_VERSION := 4.26.CANDIDATE
+JACK_STABLE_VERSION := 4.25.BETA
+JACK_DOGFOOD_VERSION := 4.25.BETA
+JACK_SDKTOOL_VERSION := 4.25.BETA
+JACK_LANG_DEV_VERSION := 4.25.BETA
ifneq ("$(wildcard $(jack_eng_jar))","")
JACK_ENGINEERING_VERSION := $(shell java -jar $(jack_jar_tools) --version-code jack $(jack_eng_jar))
endif
diff --git a/tools/jacks/jack-4.26.CANDIDATE.jar b/tools/jacks/jack-4.25.BETA.jar
similarity index 84%
rename from tools/jacks/jack-4.26.CANDIDATE.jar
rename to tools/jacks/jack-4.25.BETA.jar
index 7352d45..a848fc0 100644
--- a/tools/jacks/jack-4.26.CANDIDATE.jar
+++ b/tools/jacks/jack-4.25.BETA.jar
Binary files differ
diff --git a/tools/jills/jill-4.26.CANDIDATE.jar b/tools/jills/jill-4.25.BETA.jar
similarity index 87%
rename from tools/jills/jill-4.26.CANDIDATE.jar
rename to tools/jills/jill-4.25.BETA.jar
index 66b5c4f..3c03a67 100644
--- a/tools/jills/jill-4.26.CANDIDATE.jar
+++ b/tools/jills/jill-4.25.BETA.jar
Binary files differ
