commit df49f2b5fe6474d564c03923069d15d88d1a7f67
author Benoit Lamarche <benoitlamarche@google.com> Fri Sep 23 15:06:56 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 23 15:06:56 2016 +0000
tree fad39678cb4f50942e02eecdbe5853d3689d3ea0
parent cdbb9d919a57996e2516ce0a9e204ab76d6039ae
parent b1d615de4ef076c28c435b27f17f11c751a6c8a3

Merge "Import Jack and Jill Carnac 1.3-b5 for Dogfood" am: 2c4be2a40d am: 34dfcb316f
am: b1d615de4e

Change-Id: I5040c808599fc41725f0d00a8f7847e064ccfef1

tools/jack_versions.mk

diff --git a/tools/jack_versions.mk b/tools/jack_versions.mk
index b372544..1ccf87c 100644
--- a/tools/jack_versions.mk
+++ b/tools/jack_versions.mk
@@ -19,7 +19,7 @@
 jack_eng_jar := $(LOCAL_PATH)/jacks/jack.jar
 
 JACK_STABLE_VERSION := 4.8.BETA
-JACK_DOGFOOD_VERSION := 4.9.BETA
+JACK_DOGFOOD_VERSION := 4.10.BETA
 JACK_SDKTOOL_VERSION := 4.8.BETA
 JACK_LANG_DEV_VERSION := 4.8.BETA
 ifneq ("$(wildcard $(jack_eng_jar))","")

tools/jacks/jack-4.10.BETA.jar

diff --git a/tools/jacks/jack-4.9.BETA.jar b/tools/jacks/jack-4.10.BETA.jar
similarity index 91%
rename from tools/jacks/jack-4.9.BETA.jar
rename to tools/jacks/jack-4.10.BETA.jar
index 8a59704..a13daa9 100644
--- a/tools/jacks/jack-4.9.BETA.jar
+++ b/tools/jacks/jack-4.10.BETA.jar
Binary files differ

tools/jills/jill-4.10.BETA.jar

diff --git a/tools/jills/jill-4.9.BETA.jar b/tools/jills/jill-4.10.BETA.jar
similarity index 93%
rename from tools/jills/jill-4.9.BETA.jar
rename to tools/jills/jill-4.10.BETA.jar
index 432e4ca..126b565 100644
--- a/tools/jills/jill-4.9.BETA.jar
+++ b/tools/jills/jill-4.10.BETA.jar
Binary files differ