summaryrefslogtreecommitdiffstats
path: root/core/tests
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-03-19 10:11:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-19 10:11:19 -0700
commitc9fe40ead549ff18393c0cc5c6e3bd67548f9da6 (patch)
tree859c4473a55281c2e85b71d9cf408ee50e1c62c7 /core/tests
parentbab316fea269369194d3126a5d79409c9192580f (diff)
parent71558f1fafa29fe993ab0556bbaee6530f3930d7 (diff)
downloadframeworks_base-c9fe40ead549ff18393c0cc5c6e3bd67548f9da6.zip
frameworks_base-c9fe40ead549ff18393c0cc5c6e3bd67548f9da6.tar.gz
frameworks_base-c9fe40ead549ff18393c0cc5c6e3bd67548f9da6.tar.bz2
am 71558f1f: Merge "Fix times in debugging output to use H rather than k."
* commit '71558f1fafa29fe993ab0556bbaee6530f3930d7': Fix times in debugging output to use H rather than k.
Diffstat (limited to 'core/tests')
-rw-r--r--core/tests/coretests/src/android/webkit/WebkitTest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/tests/coretests/src/android/webkit/WebkitTest.java b/core/tests/coretests/src/android/webkit/WebkitTest.java
index 17b4088..4685e3c 100644
--- a/core/tests/coretests/src/android/webkit/WebkitTest.java
+++ b/core/tests/coretests/src/android/webkit/WebkitTest.java
@@ -52,7 +52,7 @@ public class WebkitTest extends AndroidTestCase {
date.setTime(time);
c.setTime(date);
index = dateSorter.getIndex(time);
- Log.i(LOGTAG, "time: " + DateFormat.format("yyyy/MM/dd kk:mm:ss", c).toString() +
+ Log.i(LOGTAG, "time: " + DateFormat.format("yyyy/MM/dd HH:mm:ss", c).toString() +
" " + index + " " + dateSorter.getLabel(index));
}
}