Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d3b1338 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am c9fe40ea: am 71558f1f: Merge "Fix times in debugging output to use H rather than k." 

* commit 'c9fe40ea':
  Fix times in debugging output to use H rather than k.
parents b5482b2f c9fe40ea

core/tests/coretests/src/android/webkit/WebkitTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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));

        }

    }

services/java/com/android/server/BackupManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -3931,7 +3931,7 @@ class BackupManagerService extends IBackupManager.Stub { 
                b.append(String.format(" %9d ", info.size));



                Date stamp = new Date(info.mtime);

                b.append(new SimpleDateFormat("MMM dd kk:mm:ss ").format(stamp));

                b.append(new SimpleDateFormat("MMM dd HH:mm:ss ").format(stamp));



                b.append(info.packageName);

                b.append(" :: ");