Merge java_staging/src into java/src.

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.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.toolbar;
 
 import android.content.Context;
 
 import org.chromium.base.ApplicationStatus;
 import org.chromium.chrome.R;
@@ skipping 104 matching lines @@
     @Override
     public int getPrimaryColor() {
         return mPrimaryColor;
     }
 
     @Override
     public boolean isUsingBrandColor() {
         return mIsUsingBrandColor;
     }
 }