commit 7a7ae2306cc90a0236b52111ed978929d9b81c7d
author Benoit Lamarche <benoitlamarche@google.com> Tue Oct 18 08:27:07 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 18 08:27:07 2016 +0000
tree 69ba0070a2d198bafa9529e622616cd9d0a33d8e
parent dac024b2c766bd7edac940a8f48cb31e232b75cc
parent 6e73f19e3f6309822934ae787b3915dd7d2863a6

Merge "Import Jack and Jill Douarn 1.3-b7 for Dogfood" am: ccc9bd8c29 am: d0bc3fc126
am: 6e73f19e3f

Change-Id: If4b09bebe3191fc62b6cde6c934f5194eebfbab1

tools/jack_versions.mk

diff --git a/tools/jack_versions.mk b/tools/jack_versions.mk
index 620645f..f3ed281 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.10.BETA
-JACK_DOGFOOD_VERSION := 4.11.BETA
+JACK_DOGFOOD_VERSION := 4.12.BETA
 JACK_SDKTOOL_VERSION := 4.10.BETA
 JACK_LANG_DEV_VERSION := 4.10.BETA
 ifneq ("$(wildcard $(jack_eng_jar))","")

tools/jacks/jack-4.12.BETA.jar

diff --git a/tools/jacks/jack-4.12.BETA.jar b/tools/jacks/jack-4.12.BETA.jar
new file mode 100644
index 0000000..0f07729
--- /dev/null
+++ b/tools/jacks/jack-4.12.BETA.jar
Binary files differ

tools/jills/jill-4.12.BETA.jar

diff --git a/tools/jills/jill-4.12.BETA.jar b/tools/jills/jill-4.12.BETA.jar
new file mode 100644
index 0000000..1e28239
--- /dev/null
+++ b/tools/jills/jill-4.12.BETA.jar
Binary files differ