diff --git a/res/layout/call_log_fragment.xml b/res/layout/call_log_fragment.xml
index 3646edc..687fa35 100644
--- a/res/layout/call_log_fragment.xml
+++ b/res/layout/call_log_fragment.xml
@@ -32,11 +32,15 @@
     />
     </FrameLayout>
 
-    <FrameLayout>
+    <FrameLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        >
         <TextView
             android:id="@+id/filter_status"
             style="@style/ContactListSeparatorTextViewStyle"
             android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/call_log_outer_margin"
             android:layout_marginRight="@dimen/call_log_outer_margin"
             android:paddingTop="@dimen/call_log_inner_margin"
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 5b8984a..8cd0a80 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -303,7 +303,7 @@
     <string name="relationLabelsGroup" msgid="1854373894284572781">"Uhusiano"</string>
     <string name="groupsLabel" msgid="8573535366319059326">"Vikundi"</string>
     <string name="dialog_new_contact_account" msgid="9044704073286262197">"Weka anwani chini ya akaunti"</string>
-    <string name="dialog_new_group_account" msgid="2318032089273496830">"Unda kikundi chini ya akaunti"</string>
+    <string name="dialog_new_group_account" msgid="2318032089273496830">"Buni kikundi chini ya akaunti"</string>
     <string name="menu_sync_remove" msgid="3266725887008450161">"Ondoa kikundi cha usawazishaji"</string>
     <string name="dialog_sync_add" msgid="8267045393119375803">"Ongeza kikundi cha usawazishaji"</string>
     <string name="display_more_groups" msgid="2682547080423434170">"Vikundi zaidi..."</string>
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";
     }