am 1b761a95: am d1e4e735: Merge "Revert "Avoid using NanoTime for compiler and verifi...

author Ian Rogers <irogers@google.com>

Thu, 28 Aug 2014 17:13:51 +0000 (17:13 +0000)

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

Thu, 28 Aug 2014 17:13:51 +0000 (17:13 +0000)
author Ian Rogers <irogers@google.com>
Thu, 28 Aug 2014 17:13:51 +0000 (17:13 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 28 Aug 2014 17:13:51 +0000 (17:13 +0000)
diff --cc compiler/driver/compiler_driver.cc
Simple merge
diff --cc runtime/verifier/method_verifier.cc
Simple merge
author	Ian Rogers <irogers@google.com>
	Thu, 28 Aug 2014 17:13:51 +0000 (17:13 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 28 Aug 2014 17:13:51 +0000 (17:13 +0000)
		1	2
compiler/driver/compiler_driver.cc	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/verifier/method_verifier.cc	patch \|	diff1 \|	diff2 \|	blob \| history