Merge "Clean up ScopedThreadStateChange to use ObjPtr" am: 74a69eda05 am: 039ef51ee7

author Mathieu Chartier <mathieuc@google.com>

Fri, 30 Sep 2016 02:42:33 +0000 (02:42 +0000)

committer android-build-merger <android-build-merger@google.com>

Fri, 30 Sep 2016 02:42:33 +0000 (02:42 +0000)
author Mathieu Chartier <mathieuc@google.com>
Fri, 30 Sep 2016 02:42:33 +0000 (02:42 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 30 Sep 2016 02:42:33 +0000 (02:42 +0000)
diff --cc runtime/runtime.cc
Simple merge
diff --cc runtime/utils.cc
Simple merge
author	Mathieu Chartier <mathieuc@google.com>
	Fri, 30 Sep 2016 02:42:33 +0000 (02:42 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 30 Sep 2016 02:42:33 +0000 (02:42 +0000)
		1	2
runtime/runtime.cc	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/utils.cc	patch \|	diff1 \|	diff2 \|	blob \| history