[Signin] Update order of buttons in dialog for merging data

chrome/android/java/res/layout/confirm_import_sync_data.xml

Index: chrome/android/java/res/layout/confirm_import_sync_data.xml
diff --git a/chrome/android/java/res/layout/confirm_import_sync_data.xml b/chrome/android/java/res/layout/confirm_import_sync_data.xml
index 5e6d1e9a843807dd249ce80845d0816c727f3004..c3f0eff45f0c4d218850280b93b585bf73abeba7 100644
--- a/chrome/android/java/res/layout/confirm_import_sync_data.xml
+++ b/chrome/android/java/res/layout/confirm_import_sync_data.xml
@@ -7,15 +7,16 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:overScrollMode="ifContentScrolls" 
+    android:overScrollMode="ifContentScrolls"
+    android:paddingTop="25dp"
     android:paddingEnd="25dp"
     android:paddingStart="25dp">
 
     <LinearLayout
+        android:id="@+id/sync_import_data_linear_layout"

[gogerald1, 2017/01/05 15:39:38]

nit: sync_import_data or sync_import_data_content? ..._linear_layout looks a
little strange

[bzanotti, 2017/01/05 17:39:31]

Done.

         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingTop="8dp">
+        android:orientation="vertical">
 
         <TextView
             android:id="@+id/sync_import_data_prompt"
@@ -23,7 +24,7 @@
             android:layout_height="wrap_content"
             android:textColor="#de000000"
             android:textSize="16sp" />
-        
+
         <org.chromium.chrome.browser.widget.RadioButtonWithDescription
             android:id="@+id/sync_confirm_import_choice"
             android:layout_width="match_parent"
@@ -39,4 +40,4 @@
             app:titleText="@string/sync_keep_existing_data_separate" />
 
     </LinearLayout>
-</ScrollView>
+</ScrollView>