Merge "Show stack maps and Dex register maps in oatdump's assembly code."

author Roland Levillain <rpl@google.com>

Wed, 3 Jun 2015 11:00:37 +0000 (11:00 +0000)

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

Wed, 3 Jun 2015 11:00:37 +0000 (11:00 +0000)
author Roland Levillain <rpl@google.com>
Wed, 3 Jun 2015 11:00:37 +0000 (11:00 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 3 Jun 2015 11:00:37 +0000 (11:00 +0000)
diff --cc oatdump/oatdump.cc
Simple merge
diff --cc runtime/stack_map.h
Simple merge
author	Roland Levillain <rpl@google.com>
	Wed, 3 Jun 2015 11:00:37 +0000 (11:00 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Wed, 3 Jun 2015 11:00:37 +0000 (11:00 +0000)
		1	2
oatdump/oatdump.cc	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/stack_map.h	patch \|	diff1 \|	diff2 \|	blob \| history