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

ui/android/java/res/layout/radio_button_with_description.xml

Index: ui/android/java/res/layout/radio_button_with_description.xml
diff --git a/ui/android/java/res/layout/radio_button_with_description.xml b/ui/android/java/res/layout/radio_button_with_description.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c18d0cf15884fbf5dba24da5e646947dd3a42ec2
--- /dev/null
+++ b/ui/android/java/res/layout/radio_button_with_description.xml
@@ -0,0 +1,35 @@
+<?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. -->
+
+<!-- RadioButtonWithDescription extends LinearLayout -->
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:paddingTop="10dp" >
+
+    <RadioButton
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/radio_button"

[May, 2016/02/17 14:22:11]

android:id should be the first attribute

[PEConn, 2016/02/18 17:20:48]

Done.

+        android:layout_gravity="center_horizontal" />
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@android:color/black" />
+
+        <TextView
+            android:id="@+id/description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+    </LinearLayout>
+</merge>