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

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

 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2015 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.
 -->
 <org.chromium.chrome.browser.firstrun.TosAndUmaView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
@@ skipping 23 matching lines @@
 
             <LinearLayout
                 android:id="@+id/fre_content"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/fre_margin"
                 android:gravity="center_horizontal">
 
                 <ImageView
                     android:layout_width="wrap_content"
-                    android:layout_height="@dimen/fre_image_carousel_height"
+                    android:layout_height="@dimen/fre_image_height"
                     android:layout_marginBottom="@dimen/fre_margin"
                     android:contentDescription="@null"
                     android:src="@drawable/fre_product_logo" />
 
                 <LinearLayout
                     android:id="@+id/text_wrapper"
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     android:layout_weight="1"
                     android:layout_marginBottom="@dimen/fre_margin"
@@ skipping 35 matching lines @@
         android:layout_height="56dp"
         android:layout_gravity="bottom"
         android:background="?attr/listChoiceBackgroundIndicator"
         android:padding="16dp"
         android:text="@string/fre_accept_continue"
         android:textAllCaps="true"
         android:textColor="@color/light_active_color"
         android:textSize="@dimen/fre_button_text_size" />
 
 </org.chromium.chrome.browser.firstrun.TosAndUmaView>