Merge "Write .debug_line section using the new DWARF library."

author David Srbecky <dsrbecky@google.com>

Thu, 2 Apr 2015 14:12:01 +0000 (14:12 +0000)

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

Thu, 2 Apr 2015 14:12:03 +0000 (14:12 +0000)
author David Srbecky <dsrbecky@google.com>
Thu, 2 Apr 2015 14:12:01 +0000 (14:12 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 2 Apr 2015 14:12:03 +0000 (14:12 +0000)
diff --cc compiler/dex/quick/x86/call_x86.cc
Simple merge
diff --cc compiler/oat_writer.cc
Simple merge
diff --cc compiler/oat_writer.h
Simple merge
author	David Srbecky <dsrbecky@google.com>
	Thu, 2 Apr 2015 14:12:01 +0000 (14:12 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Thu, 2 Apr 2015 14:12:03 +0000 (14:12 +0000)
		1	2
compiler/dex/quick/x86/call_x86.cc	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/oat_writer.cc	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/oat_writer.h	patch \|	diff1 \|	diff2 \|	blob \| history