Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
diff --git a/res/layout/edit_delete_button.xml b/res/layout/edit_delete_button.xml
index eff2c51..d2c7fb9 100644
--- a/res/layout/edit_delete_button.xml
+++ b/res/layout/edit_delete_button.xml
@@ -21,8 +21,6 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="@dimen/editor_min_line_item_height"
- android:layout_marginRight="2dip"
- android:layout_marginEnd="2dip"
android:layout_gravity="center_vertical">
<ImageView
android:id="@+id/delete_button"
diff --git a/src/com/android/contacts/ContactSaveService.java b/src/com/android/contacts/ContactSaveService.java
index bb03705..aed0f34 100644
--- a/src/com/android/contacts/ContactSaveService.java
+++ b/src/com/android/contacts/ContactSaveService.java
@@ -515,7 +515,8 @@
final ArrayList<ContentProviderOperation> diff,
final ContentProviderResult[] results) {
final int diffSize = diff.size();
- for (int i = 0; i < diffSize; i++) {
+ final int numResults = results.length;
+ for (int i = 0; i < diffSize && i < numResults; i++) {
ContentProviderOperation operation = diff.get(i);
if (operation.getType() == ContentProviderOperation.TYPE_INSERT
&& operation.getUri().getEncodedPath().contains(