Merge "Generalize Valgrind annotations in ART to support ASan."

author Evgenii Stepanov <eugenis@google.com>

Tue, 14 Jul 2015 00:47:06 +0000 (00:47 +0000)

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

Tue, 14 Jul 2015 00:48:54 +0000 (00:48 +0000)
author Evgenii Stepanov <eugenis@google.com>
Tue, 14 Jul 2015 00:47:06 +0000 (00:47 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 14 Jul 2015 00:48:54 +0000 (00:48 +0000)
diff --cc runtime/runtime.cc
Simple merge
diff --cc runtime/runtime.h
Simple merge
diff --cc runtime/thread.cc
Simple merge
diff --cc runtime/thread.h
Simple merge
author	Evgenii Stepanov <eugenis@google.com>
	Tue, 14 Jul 2015 00:47:06 +0000 (00:47 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Tue, 14 Jul 2015 00:48:54 +0000 (00:48 +0000)
		1	2
runtime/runtime.cc	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/runtime.h	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/thread.cc	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/thread.h	patch \|	diff1 \|	diff2 \|	blob \| history