Merge java_staging/src into java/src.

chrome/android/java/src/org/chromium/chrome/browser/omnibox/AnswerTextBuilder.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.omnibox;
 
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.text.Html;
 import android.text.Spannable;
@@ skipping 277 matching lines @@
         public void updateDrawState(TextPaint tp) {
             tp.baselineShift += mBaselineShift;
         }
 
         @Override
         public void updateMeasureState(TextPaint tp) {
             tp.baselineShift += mBaselineShift;
         }
     }
 }