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, 1 insertions, 1 deletions

diff --git a/runtime/gc/heap_test.cc b/runtime/gc/heap_test.cc
index 8720a3e014..7cbad3b523 100644
--- a/runtime/gc/heap_test.cc
+++ b/runtime/gc/heap_test.cc
@@ -29,7 +29,7 @@ namespace gc {
 
 class HeapTest : public CommonRuntimeTest {
  public:
-  void SetUp() OVERRIDE {
+  void SetUp() override {
     MemMap::Init();
     std::string error_msg;
     // Reserve the preferred address to force the heap to use another one for testing.