commit 05c3aa4d9b9f6582fd75d7884a8095e75310cb54
author Ian Rogers <irogers@google.com> Tue May 06 23:22:26 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 06 23:22:27 2014 +0000
tree 59a07138239b1a5a3a20c937c618b7017e544ebc
parent 069849e1469b55984d9e208b2ada345aa57f8947
parent 2fa98e26ddd71ca147869b84fc117751ae6ca92a

Merge "Fix typo."

runtime/interpreter/interpreter_goto_table_impl.cc

diff --git a/runtime/interpreter/interpreter_goto_table_impl.cc b/runtime/interpreter/interpreter_goto_table_impl.cc
index 74b7c42..e425e91 100644
--- a/runtime/interpreter/interpreter_goto_table_impl.cc
+++ b/runtime/interpreter/interpreter_goto_table_impl.cc
@@ -519,7 +519,7 @@
       // Don't allow finalizable objects to be allocated during a transaction since these can't be
       // finalized without a started runtime.
       if (transaction_active && obj->GetClass()->IsFinalizable()) {
-        AbortTransaction(self, "Allocating finalizable object in transcation: %s",
+        AbortTransaction(self, "Allocating finalizable object in transaction: %s",
                          PrettyTypeOf(obj).c_str());
         HANDLE_PENDING_EXCEPTION();
       }

runtime/interpreter/interpreter_switch_impl.cc

diff --git a/runtime/interpreter/interpreter_switch_impl.cc b/runtime/interpreter/interpreter_switch_impl.cc
index 0da1445..9c13973 100644
--- a/runtime/interpreter/interpreter_switch_impl.cc
+++ b/runtime/interpreter/interpreter_switch_impl.cc
@@ -432,7 +432,7 @@
           // Don't allow finalizable objects to be allocated during a transaction since these can't
           // be finalized without a started runtime.
           if (transaction_active && obj->GetClass()->IsFinalizable()) {
-            AbortTransaction(self, "Allocating finalizable object in transcation: %s",
+            AbortTransaction(self, "Allocating finalizable object in transaction: %s",
                              PrettyTypeOf(obj).c_str());
             HANDLE_PENDING_EXCEPTION();
             break;