am 2602e205: am 074c8c6a: Merge "Avoid using NanoTime for compiler and verifier"...

author Mathieu Chartier <mathieuc@google.com>

Wed, 27 Aug 2014 22:06:02 +0000 (22:06 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Wed, 27 Aug 2014 22:06:02 +0000 (22:06 +0000)
author Mathieu Chartier <mathieuc@google.com>
Wed, 27 Aug 2014 22:06:02 +0000 (22:06 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 27 Aug 2014 22:06:02 +0000 (22:06 +0000)
diff --cc compiler/driver/compiler_driver.cc
Simple merge
diff --cc runtime/verifier/method_verifier.cc
Simple merge
author	Mathieu Chartier <mathieuc@google.com>
	Wed, 27 Aug 2014 22:06:02 +0000 (22:06 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 27 Aug 2014 22:06:02 +0000 (22:06 +0000)
		1	2
compiler/driver/compiler_driver.cc	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/verifier/method_verifier.cc	patch \|	diff1 \|	diff2 \|	blob \| history