commit 6eb4e2305c23fb1036db4926786846d49475f1eb
author Chiao Cheng <chiaocheng@google.com> Thu Nov 29 14:27:51 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 29 14:27:51 2012 -0800
tree ea221d58971a7b73558801ff179a389d09576f0d
parent 88afb4413be728c1a454d5556d734c1634c908e7
parent 9d8108fe72b4783d68c08f3ce86cd7bb203063f5

am 9d8108fe: am 226fae4d: Merge "Cherry picking BitmapUtilTest fix." into jb-mr1.1-dev

* commit '9d8108fe72b4783d68c08f3ce86cd7bb203063f5':
  Cherry picking BitmapUtilTest fix.

src/com/android/contacts/util/ContactPhotoUtils.java

diff --git a/src/com/android/contacts/util/ContactPhotoUtils.java b/src/com/android/contacts/util/ContactPhotoUtils.java
index 49be19d..b14b36c 100644
--- a/src/com/android/contacts/util/ContactPhotoUtils.java
+++ b/src/com/android/contacts/util/ContactPhotoUtils.java
@@ -30,6 +30,7 @@
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Locale;
 
 /**
  * Utilities related to loading/saving contact photos.
@@ -69,7 +70,7 @@
 
     public static String generateTempPhotoFileName() {
         Date date = new Date(System.currentTimeMillis());
-        SimpleDateFormat dateFormat = new SimpleDateFormat(PHOTO_DATE_FORMAT);
+        SimpleDateFormat dateFormat = new SimpleDateFormat(PHOTO_DATE_FORMAT, Locale.US);
         return "ContactPhoto-" + dateFormat.format(date) + ".jpg";
     }