commit 4a84295940419bee456370d05f3154e1fcb6f74d
author Baligh Uddin <baligh@google.com> Thu Dec 06 18:58:52 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Dec 06 18:58:52 2012 -0800
tree d8829fa329ee487bc6e12500d2c893ec6e854c48
parent 36285367fd33b2210cbecec67aade65399c7d149
parent 6d47579d78a1c731aaeb8f3682ddf557952f186f

am 6d47579d: am 82bdbbfc: Import translations. DO NOT MERGE

* commit '6d47579d78a1c731aaeb8f3682ddf557952f186f':
  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";
     }