summaryrefslogtreecommitdiffstats
path: root/core/tests
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-03-19 10:13:34 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-19 10:13:34 -0700
commit6d3b13384e5ac4261eff264e7f8855610815e728 (patch)
tree56b3af73ad7f535c029059ba79879ab1b944df01 /core/tests
parentb5482b2f8ac82143ae246794d237f35a471142d6 (diff)
parentc9fe40ead549ff18393c0cc5c6e3bd67548f9da6 (diff)
downloadframeworks_base-6d3b13384e5ac4261eff264e7f8855610815e728.zip
frameworks_base-6d3b13384e5ac4261eff264e7f8855610815e728.tar.gz
frameworks_base-6d3b13384e5ac4261eff264e7f8855610815e728.tar.bz2
am c9fe40ea: am 71558f1f: Merge "Fix times in debugging output to use H rather than k."
* commit 'c9fe40ead549ff18393c0cc5c6e3bd67548f9da6': 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));
}
}