commit 52805b91b5a4d8a48ed76c0c879b9041051d507e
author Jean-Baptiste Queru <jbq@google.com> Mon Mar 11 13:13:31 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 11 13:13:31 2013 -0700
tree d8829fa329ee487bc6e12500d2c893ec6e854c48
parent 4a84295940419bee456370d05f3154e1fcb6f74d
parent 1d9e1671e0ff4e27ed57951365bff456cbdc4a90

am 1d9e1671: am e5af0899: am f31bca4f: (-s ours) am 2d9e4e9f: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '1d9e1671e0ff4e27ed57951365bff456cbdc4a90':

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