Merge "ART: Add generic system-weak holder infrastructure"

author Andreas Gampe <agampe@google.com>

Mon, 12 Sep 2016 23:18:38 +0000 (23:18 +0000)

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

Mon, 12 Sep 2016 23:18:39 +0000 (23:18 +0000)
author Andreas Gampe <agampe@google.com>
Mon, 12 Sep 2016 23:18:38 +0000 (23:18 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 12 Sep 2016 23:18:39 +0000 (23:18 +0000)
diff --cc build/Android.gtest.mk
Simple merge
diff --cc runtime/runtime.cc
Simple merge
diff --cc runtime/runtime.h
Simple merge
author	Andreas Gampe <agampe@google.com>
	Mon, 12 Sep 2016 23:18:38 +0000 (23:18 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Mon, 12 Sep 2016 23:18:39 +0000 (23:18 +0000)
		1	2
build/Android.gtest.mk	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/runtime.cc	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/runtime.h	patch \|	diff1 \|	diff2 \|	blob \| history