Merge "linker: Allow caller to specify parent namespace"

author Treehugger Robot <treehugger-gerrit@google.com>

Tue, 17 May 2016 22:43:00 +0000 (22:43 +0000)

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

Tue, 17 May 2016 22:43:01 +0000 (22:43 +0000)
author Treehugger Robot <treehugger-gerrit@google.com>
Tue, 17 May 2016 22:43:00 +0000 (22:43 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 17 May 2016 22:43:01 +0000 (22:43 +0000)
diff --cc linker/linker.cpp
Simple merge
diff --cc tests/dlext_test.cpp
Simple merge
author	Treehugger Robot <treehugger-gerrit@google.com>
	Tue, 17 May 2016 22:43:00 +0000 (22:43 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Tue, 17 May 2016 22:43:01 +0000 (22:43 +0000)
		1	2
linker/linker.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
tests/dlext_test.cpp	patch \|	diff1 \|	diff2 \|	blob \| history