Merge java_staging/src into java/src.

chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsPromoView.java

 // 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.
 
 package org.chromium.chrome.browser.ntp;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.app.Activity;
@@ skipping 266 matching lines @@
             @Override
             public void onFailedToSetForcedAccount(String forcedAccountName) {
                 // TODO(bauerb): make sure we shouldn't see SignInPromoView.
                 assert false : "No forced accounts in SignInPromoView";
             }
         });
 
         return signInPromoView;
     }
 }