commit c7b0bbf20780be8efe77ed1fefff2632e9e79484
author Santos Cordon <santoscordon@google.com> Tue May 28 17:20:12 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue May 28 17:20:12 2013 -0700
tree f7f930b159af02fba18e2386f10be97232d1d389
parent e7902c4f4c0755ad55af3ed680efa5027483abcf
parent 7a4a4cd08aac01aed1a6a3d2cb88f4bfdc6dac39

am 7a4a4cd0: am 5537b232: Set explicit destination for CALL_PRIVILEGED

* commit '7a4a4cd08aac01aed1a6a3d2cb88f4bfdc6dac39':
  Set explicit destination for CALL_PRIVILEGED

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