Merge "Remove changing uids/timestamps from zip/jar files" am: a0975edc16

author Dan Willemsen <dwillemsen@google.com>

Tue, 3 Nov 2015 23:43:30 +0000 (23:43 +0000)

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

Tue, 3 Nov 2015 23:43:30 +0000 (23:43 +0000)
author Dan Willemsen <dwillemsen@google.com>
Tue, 3 Nov 2015 23:43:30 +0000 (23:43 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 3 Nov 2015 23:43:30 +0000 (23:43 +0000)
diff --cc core/Makefile
Simple merge
diff --cc core/config.mk
Simple merge
diff --cc core/droiddoc.mk
Simple merge
author	Dan Willemsen <dwillemsen@google.com>
	Tue, 3 Nov 2015 23:43:30 +0000 (23:43 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 3 Nov 2015 23:43:30 +0000 (23:43 +0000)
		1	2
core/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
core/config.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/droiddoc.mk	patch \|	diff1 \|	diff2 \|	blob \| history