commit 00b3f6dc4b876aebc15068428b65e1c868826633
author The Android Automerger <android-build@google.com> Wed Jul 22 01:08:58 2015 -0700
committer The Android Automerger <android-build@google.com> Wed Jul 22 01:08:58 2015 -0700
tree 285225df78417a69a8e58cc7e7c706e4ffbf2b04
parent 43a5b49845f3f9bdb69b47268bfc39fc6ce77469
parent b5351438ce305590c4df62017729a32a65a0f246

merge in mnc-release history after reset to mnc-dev

tools/jack

diff --git a/tools/jack b/tools/jack
index 94ffc53..ab59768 100755
--- a/tools/jack
+++ b/tools/jack
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Version: 1.1-mr1
+# Version: 1.1-mr2
 #
 set -o nounset
 umask 077

tools/jack-admin

diff --git a/tools/jack-admin b/tools/jack-admin
index 3c8ff14..a7c4e8e 100755
--- a/tools/jack-admin
+++ b/tools/jack-admin
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Version: 1.1-mr1
+# Version: 1.1-mr2
 #
 set -o nounset
 umask 077

tools/jack-launcher.jar

diff --git a/tools/jack-launcher.jar b/tools/jack-launcher.jar
index b05dedb..a7d9e61 100644
--- a/tools/jack-launcher.jar
+++ b/tools/jack-launcher.jar
Binary files differ

tools/jack.jar

diff --git a/tools/jack.jar b/tools/jack.jar
index e521994..47da02e 100644
--- a/tools/jack.jar
+++ b/tools/jack.jar
Binary files differ

tools/jill.jar

diff --git a/tools/jill.jar b/tools/jill.jar
index 135c25f..f1146a5 100644
--- a/tools/jill.jar
+++ b/tools/jill.jar
Binary files differ