Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '71558f1fafa29fe993ab0556bbaee6530f3930d7':
  Fix times in debugging output to use H rather than k.
This commit is contained in:
Elliott Hughes
2013-03-19 10:11:19 -07:00
committed by Android Git Automerger
parent bab316fea2 71558f1faf
commit c9fe40ead5
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/tests/coretests/src/android/webkit/WebkitTest.java
View File

@@ -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));
}
}

2
services/java/com/android/server/BackupManagerService.java
View File

@@ -3795,7 +3795,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(" :: ");