Merge "Remove usages of jill.jar, use jack instead"

author Sebastien Hertz <shertz@google.com>

Thu, 11 Feb 2016 08:48:44 +0000 (08:48 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Thu, 11 Feb 2016 08:48:44 +0000 (08:48 +0000)
author Sebastien Hertz <shertz@google.com>
Thu, 11 Feb 2016 08:48:44 +0000 (08:48 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 11 Feb 2016 08:48:44 +0000 (08:48 +0000)
diff --cc core/definitions.mk
Simple merge
diff --cc core/prebuilt_internal.mk
Simple merge
author	Sebastien Hertz <shertz@google.com>
	Thu, 11 Feb 2016 08:48:44 +0000 (08:48 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Thu, 11 Feb 2016 08:48:44 +0000 (08:48 +0000)
		1	2
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/prebuilt_internal.mk	patch \|	diff1 \|	diff2 \|	blob \| history