aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavor Bertovic <davor@losinj.com>2014-03-30 06:01:40 -0400
committerGerrit Code Review <gerrit@doa.deadnet.net>2014-03-30 06:01:40 -0400
commit63542eeb167b7b5375f96ddf72d7f92bf19a5ec9 (patch)
tree3f0026094259f83bf9ee52f42846d221aa881f5f
parent20acc95da26e60e83dab776479d3dd19629fee35 (diff)
parent7f546ce9c78a778a24a6c3133f732fd83134a3dd (diff)
Merge "Revert "Change exception message for ArrayStoreException."" into kitkat
-rw-r--r--vm/Exception.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/vm/Exception.cpp b/vm/Exception.cpp
index 36f2d20c0..ca7614096 100644
--- a/vm/Exception.cpp
+++ b/vm/Exception.cpp
@@ -1225,7 +1225,7 @@ void dvmThrowArrayStoreExceptionNotArray(ClassObject* actual, const char* label)
void dvmThrowArrayStoreExceptionIncompatibleArrays(ClassObject* source, ClassObject* destination)
{
throwTypeError(gDvm.exArrayStoreException,
- "Incompatible types: src=%s, dst=%s",
+ "%s and %s are incompatible array types",
source, destination);
}