Merge "Sign APKs using SHA-256 instead of SHA-1 when possible." am: 50f872c696

author Alex Klyubin <klyubin@google.com>

Fri, 29 Jan 2016 20:25:10 +0000 (20:25 +0000)

committer android-build-merger <android-build-merger@google.com>

Fri, 29 Jan 2016 20:25:10 +0000 (20:25 +0000)
author Alex Klyubin <klyubin@google.com>
Fri, 29 Jan 2016 20:25:10 +0000 (20:25 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 29 Jan 2016 20:25:10 +0000 (20:25 +0000)
diff --cc core/definitions.mk
Simple merge
diff --cc core/prebuilt_internal.mk
Simple merge
author	Alex Klyubin <klyubin@google.com>
	Fri, 29 Jan 2016 20:25:10 +0000 (20:25 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 29 Jan 2016 20:25:10 +0000 (20:25 +0000)
		1	2
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/prebuilt_internal.mk	patch \|	diff1 \|	diff2 \|	blob \| history