Merge "ART: Disambiguate access-checks mode from lock-counting" into nyc-dev

author Andreas Gampe <agampe@google.com>

Fri, 29 Apr 2016 23:13:53 +0000 (23:13 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Fri, 29 Apr 2016 23:13:53 +0000 (23:13 +0000)
author Andreas Gampe <agampe@google.com>
Fri, 29 Apr 2016 23:13:53 +0000 (23:13 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 29 Apr 2016 23:13:53 +0000 (23:13 +0000)
diff --cc runtime/art_method.h
Simple merge
diff --cc runtime/stack.cc
Simple merge
author	Andreas Gampe <agampe@google.com>
	Fri, 29 Apr 2016 23:13:53 +0000 (23:13 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 29 Apr 2016 23:13:53 +0000 (23:13 +0000)
		1	2
runtime/art_method.h	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/stack.cc	patch \|	diff1 \|	diff2 \|	blob \| history