Merge "Bandaid fix for overlapping buttons in incoming/outgoing settings" into jb-ub-mail-ur10

res/layout-sw600dp/account_settings_buttons.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="@dimen/settings_buttons_padding_top"
-    android:paddingBottom="@dimen/settings_buttons_padding_bottom"
-    >
-    <Button
-        android:id="@+id/cancel"
-        style="@style/accountSettingsButton"
-        android:layout_alignParentLeft="true"
-        android:layout_marginLeft="32dip"
-        android:text="@string/cancel_action" />
-    <Button
-        android:id="@+id/done"
-        style="@style/accountSettingsButton"
-        android:layout_alignParentRight="true"
-        android:layout_marginRight="32dip"
-        android:text="@string/done_action" />
-</RelativeLayout>
-