commit c3d8b1eb5f27531b9e0c8c85c06e6dec872de684
author Baligh Uddin <baligh@google.com> Mon Dec 03 20:57:25 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Dec 03 20:57:25 2012 -0800
tree 69bd939c074f3571b043537fc18c1e765c55864a
parent 618e4884973866e6943580490c06b73460fad402
parent 68b996fc8f9400d2a603a1a79300639d5383a313

am 68b996fc: am ccd9e544: Import translations. DO NOT MERGE

* commit '68b996fc8f9400d2a603a1a79300639d5383a313':
  Import translations. DO NOT MERGE

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";
     }