Merge "Stop encoding absolute paths in symbols" am: 9f576acde6 am: b93e8250d7

author Dan Willemsen <dwillemsen@google.com>

Tue, 20 Oct 2015 23:59:05 +0000 (23:59 +0000)

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

Tue, 20 Oct 2015 23:59:05 +0000 (23:59 +0000)
author Dan Willemsen <dwillemsen@google.com>
Tue, 20 Oct 2015 23:59:05 +0000 (23:59 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 20 Oct 2015 23:59:05 +0000 (23:59 +0000)
diff --cc core/config.mk
Simple merge
diff --cc core/definitions.mk
Simple merge
author	Dan Willemsen <dwillemsen@google.com>
	Tue, 20 Oct 2015 23:59:05 +0000 (23:59 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 20 Oct 2015 23:59:05 +0000 (23:59 +0000)
		1	2
core/config.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history