commit c31bf1f64208f5526a544951f5899520bf49e994
author Elliott Hughes <enh@google.com> Tue Mar 19 10:13:36 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 19 10:13:36 2013 -0700
tree 80071b69e7a7ba1af618a210ddafc9f89aa05269
parent cb47643377b744db334453a0237e8774a3acb91d
parent 767349ce93f3e4801d71fba07bbe702780a0d7e1

am 767349ce: am 8c331a05: Merge "Use H instead of k in DateToStringBenchmark."

* commit '767349ce93f3e4801d71fba07bbe702780a0d7e1':
  Use H instead of k in DateToStringBenchmark.

benchmarks/regression/DateToStringBenchmark.java

diff --git a/benchmarks/regression/DateToStringBenchmark.java b/benchmarks/regression/DateToStringBenchmark.java
index 15760c9..7fee61c 100644
--- a/benchmarks/regression/DateToStringBenchmark.java
+++ b/benchmarks/regression/DateToStringBenchmark.java
@@ -57,7 +57,7 @@
 
     public void timeDateToString_AndroidDateFormat(int reps) {
         for (int i = 0; i < reps; i++) {
-            DateFormat.format("EEE MMM dd kk:mm:ss zzz yyyy", calendar);
+            DateFormat.format("EEE MMM dd HH:mm:ss zzz yyyy", calendar);
         }
     }