Merge "Remove changing uids/timestamps from zip/jar files"

author Dan Willemsen <dwillemsen@google.com>

Tue, 3 Nov 2015 21:38:45 +0000 (21:38 +0000)

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

Tue, 3 Nov 2015 21:38:45 +0000 (21:38 +0000)
author Dan Willemsen <dwillemsen@google.com>
Tue, 3 Nov 2015 21:38:45 +0000 (21:38 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 3 Nov 2015 21:38:45 +0000 (21:38 +0000)
diff --cc core/Makefile
Simple merge
diff --cc core/config.mk
Simple merge
author	Dan Willemsen <dwillemsen@google.com>
	Tue, 3 Nov 2015 21:38:45 +0000 (21:38 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Tue, 3 Nov 2015 21:38:45 +0000 (21:38 +0000)
		1	2
core/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
core/config.mk	patch \|	diff1 \|	diff2 \|	blob \| history