commit f5ad1ecbb5a7d1421d818a66455beda1465eb748
author Makoto Onuki <omakoto@google.com> Mon Oct 29 14:04:45 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 29 14:04:45 2012 -0700
tree 73f42d2cfbbdfbf5c21ec488eca65e6056dcf208
parent 312f24da969b41560a09315fd5696da109151798
parent 3b653dc6bca854b8a3e44cd734c0fd8f265ab97d

am 3b653dc6: am c9001cd4: am 62db5e0e: Add missing layout_width/height

* commit '3b653dc6bca854b8a3e44cd734c0fd8f265ab97d':

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