Merge "Rename offline_profiling_info to profile_compilation_info"

author Calin Juravle <calin@google.com>

Thu, 19 Jan 2017 19:42:25 +0000 (19:42 +0000)

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

Thu, 19 Jan 2017 19:42:25 +0000 (19:42 +0000)
author Calin Juravle <calin@google.com>
Thu, 19 Jan 2017 19:42:25 +0000 (19:42 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 19 Jan 2017 19:42:25 +0000 (19:42 +0000)
diff --cc dex2oat/dex2oat.cc
Simple merge
diff --cc runtime/class_linker.cc
Simple merge
author	Calin Juravle <calin@google.com>
	Thu, 19 Jan 2017 19:42:25 +0000 (19:42 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Thu, 19 Jan 2017 19:42:25 +0000 (19:42 +0000)
		1	2
dex2oat/dex2oat.cc	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/class_linker.cc	patch \|	diff1 \|	diff2 \|	blob \| history