Merge "Discard corrupted or out of date profiles" into nyc-dev

author Calin Juravle <calin@google.com>

Fri, 25 Mar 2016 14:09:55 +0000 (14:09 +0000)

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

Fri, 25 Mar 2016 14:09:55 +0000 (14:09 +0000)
author Calin Juravle <calin@google.com>
Fri, 25 Mar 2016 14:09:55 +0000 (14:09 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 25 Mar 2016 14:09:55 +0000 (14:09 +0000)
diff --cc runtime/jit/offline_profiling_info.cc
Simple merge
diff --cc runtime/jit/offline_profiling_info.h
Simple merge
author	Calin Juravle <calin@google.com>
	Fri, 25 Mar 2016 14:09:55 +0000 (14:09 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 25 Mar 2016 14:09:55 +0000 (14:09 +0000)
		1	2
runtime/jit/offline_profiling_info.cc	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/jit/offline_profiling_info.h	patch \|	diff1 \|	diff2 \|	blob \| history