Merge "Make sure that const-class linkage is preserved, try again."

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

Thu, 1 Dec 2016 12:11:07 +0000 (12:11 +0000)

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

Thu, 1 Dec 2016 12:11:07 +0000 (12:11 +0000)
author Treehugger Robot <treehugger-gerrit@google.com>
Thu, 1 Dec 2016 12:11:07 +0000 (12:11 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 1 Dec 2016 12:11:07 +0000 (12:11 +0000)
diff --cc compiler/image_writer.cc
Simple merge
diff --cc runtime/class_linker.cc
Simple merge
diff --cc runtime/class_linker.h
Simple merge
author	Treehugger Robot <treehugger-gerrit@google.com>
	Thu, 1 Dec 2016 12:11:07 +0000 (12:11 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Thu, 1 Dec 2016 12:11:07 +0000 (12:11 +0000)
		1	2
compiler/image_writer.cc	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/class_linker.cc	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/class_linker.h	patch \|	diff1 \|	diff2 \|	blob \| history