Created the dialog offering the user to merge their account data or keep it

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
new file mode 100644
index 0000000000000000000000000000000000000000..859766ad547b0ef32665a293fd850922813f2cc1
--- /dev/null
+++ b/chrome/android/java/res/layout/confirm_import_sync_data.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2016 The Chromium Authors. All rights reserved.
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file. -->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:overScrollMode="ifContentScrolls" 
+    android:paddingEnd="30dp"
+    android:paddingStart="30dp">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"

[Yusuf, 2016/02/18 19:16:16]

android:layout_x tags should come first. if there is an id it should be
android:id
android:layout_width
android:layout_height

[PEConn, 2016/02/19 18:10:10]

Done.

+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:id="@+id/sync_import_data_prompt"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal" 
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+        
+        <org.chromium.ui.widget.RadioButtonWithDescription
+            android:id="@+id/sync_confirm_import_choice"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            app:titleText="@string/sync_import_existing_data" />
+
+        <org.chromium.ui.widget.RadioButtonWithDescription
+            android:id="@+id/sync_keep_separate_choice"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            app:titleText="@string/sync_keep_existing_data_separate" />
+
+    </LinearLayout>
+</ScrollView>