Merge "Import Jack and Jill Brest 1.1-mr5"
diff --git a/tools/jack b/tools/jack
index b2387b2..2a323fb 100755
--- a/tools/jack
+++ b/tools/jack
@@ -22,7 +22,7 @@
#
# Settings
#
-JACK_VERSION=${JACK_VERSION:=2.23.RELEASE}
+JACK_VERSION=${JACK_VERSION:=2.24.RELEASE}
JACK_HOME="${JACK_HOME:=$HOME/.jack-server}"
CLIENT_SETTING="${CLIENT_SETTING:=$HOME/.jack-settings}"
TMPDIR=${TMPDIR:=/tmp}
diff --git a/tools/jack_versions.mk b/tools/jack_versions.mk
index ffff813..0d7f450 100644
--- a/tools/jack_versions.mk
+++ b/tools/jack_versions.mk
@@ -14,7 +14,7 @@
# limitations under the License.
#
-JACK_STABLE_VERSION := 2.23.RELEASE
+JACK_STABLE_VERSION := 2.24.RELEASE
JACK_DOGFOOD_VERSION := 3.2.ALPHA
JACK_CANARY_VERSION := 3.2.ALPHA
@@ -24,4 +24,4 @@
else
# Complete android tree
JACK_DEFAULT_VERSION := $(JACK_STABLE_VERSION)
-endif
\ No newline at end of file
+endif
diff --git a/tools/jacks/jack-2.23.RELEASE.jar b/tools/jacks/jack-2.24.RELEASE.jar
similarity index 91%
rename from tools/jacks/jack-2.23.RELEASE.jar
rename to tools/jacks/jack-2.24.RELEASE.jar
index 03cb90e..4ab2501 100644
--- a/tools/jacks/jack-2.23.RELEASE.jar
+++ b/tools/jacks/jack-2.24.RELEASE.jar
Binary files differ
diff --git a/tools/jill.jar b/tools/jill.jar
index a6a0312..a2d190a 100644
--- a/tools/jill.jar
+++ b/tools/jill.jar
Binary files differ