Merge changes If4de1e1f,I11493096,I256c7758

* changes:
  Remove 'virtual' and 'override' qualifiers on final methods.
  Remove superfluous 'virtual' specifiers in ART.
  Use 'final' and 'override' specifiers directly in ART.

1 files changed, 2 insertions, 2 deletions

diff --git a/runtime/common_runtime_test.h b/runtime/common_runtime_test.h
index 234b66a862..a5157df36b 100644
--- a/runtime/common_runtime_test.h
+++ b/runtime/common_runtime_test.h
@@ -157,11 +157,11 @@ class CommonRuntimeTestBase : public TestType, public CommonRuntimeTestImpl {
   virtual ~CommonRuntimeTestBase() {}
 
  protected:
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     CommonRuntimeTestImpl::SetUp();
   }
 
-  virtual void TearDown() OVERRIDE {
+  void TearDown() override {
     CommonRuntimeTestImpl::TearDown();
   }
 };