Merge "Remove ThrowLocation."

author Nicolas Geoffray <ngeoffray@google.com>

Tue, 10 Mar 2015 15:08:13 +0000 (15:08 +0000)

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

Tue, 10 Mar 2015 15:08:13 +0000 (15:08 +0000)
author Nicolas Geoffray <ngeoffray@google.com>
Tue, 10 Mar 2015 15:08:13 +0000 (15:08 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 10 Mar 2015 15:08:13 +0000 (15:08 +0000)
diff --cc runtime/Android.mk
Simple merge
diff --cc runtime/class_linker.cc
Simple merge
author	Nicolas Geoffray <ngeoffray@google.com>
	Tue, 10 Mar 2015 15:08:13 +0000 (15:08 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Tue, 10 Mar 2015 15:08:13 +0000 (15:08 +0000)
		1	2
runtime/Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/class_linker.cc	patch \|	diff1 \|	diff2 \|	blob \| history