Merge "Save jit profiling info to file." am: e8bc4ec44a am: 449f62e059

author Calin Juravle <calin@google.com>

Wed, 25 Nov 2015 16:37:41 +0000 (16:37 +0000)

committer android-build-merger <android-build-merger@google.com>

Wed, 25 Nov 2015 16:37:41 +0000 (16:37 +0000)
author Calin Juravle <calin@google.com>
Wed, 25 Nov 2015 16:37:41 +0000 (16:37 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 25 Nov 2015 16:37:41 +0000 (16:37 +0000)
diff --cc runtime/Android.mk
Simple merge
diff --cc runtime/runtime.cc
Simple merge
author	Calin Juravle <calin@google.com>
	Wed, 25 Nov 2015 16:37:41 +0000 (16:37 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 25 Nov 2015 16:37:41 +0000 (16:37 +0000)
		1	2
runtime/Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/runtime.cc	patch \|	diff1 \|	diff2 \|	blob \| history