commit e63db27db913f1a88e2095a1ee8239b2bb9124e8
author Ian Rogers <irogers@google.com> Tue Jul 15 15:36:11 2014 -0700
committer Ian Rogers <irogers@google.com> Tue Jul 15 17:07:49 2014 -0700
tree 893dee6783bca6717259321a6e4ba029c9c123e2
parent 07b8441303ea82fca3cb85d71ecf8752d73cedd7

Break apart header files.

Create libart-gtest for common runtime and compiler gtest routines.
Rename CompilerCallbacksImpl that is quick compiler specific.
Rename trace clock source constants to not use the overloaded profiler term.

Change-Id: I4aac4bdc7e7850c68335f81e59a390133b54e933

runtime/base/scoped_flock_test.cc

diff --git a/runtime/base/scoped_flock_test.cc b/runtime/base/scoped_flock_test.cc
index 8fa181a..1fa7a12 100644
--- a/runtime/base/scoped_flock_test.cc
+++ b/runtime/base/scoped_flock_test.cc
@@ -15,9 +15,8 @@
  */
 
 #include "scoped_flock.h"
-#include "common_runtime_test.h"
 
-#include "gtest/gtest.h"
+#include "common_runtime_test.h"
 
 namespace art {