Merge "Inform Jack of the min sdk" into nyc-dev

author Yohann Roussel <yroussel@google.com>

Wed, 16 Mar 2016 15:41:58 +0000 (15:41 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 16 Mar 2016 15:41:58 +0000 (15:41 +0000)
author Yohann Roussel <yroussel@google.com>
Wed, 16 Mar 2016 15:41:58 +0000 (15:41 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 16 Mar 2016 15:41:58 +0000 (15:41 +0000)
diff --cc core/definitions.mk
Simple merge
diff --cc core/prebuilt_internal.mk
Simple merge
author	Yohann Roussel <yroussel@google.com>
	Wed, 16 Mar 2016 15:41:58 +0000 (15:41 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 16 Mar 2016 15:41:58 +0000 (15:41 +0000)
		1	2
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/prebuilt_internal.mk	patch \|	diff1 \|	diff2 \|	blob \| history