Merge java_staging/src into java/src.

chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkFolderSelectActivity.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.enhancedbookmarks;
 
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
@@ skipping 320 matching lines @@
          * Sets up padding for the entry
          */
         private void setUpPadding(FolderListEntry entry, TextView textView) {
             int paddingStart = mBasePadding + Math.min(entry.mDepth, MAX_FOLDER_DEPTH)
                     * mPaddingIncrement;
             ApiCompatibilityUtils.setPaddingRelative(textView, paddingStart, 0,
                     mBasePadding, 0);
         }
     }
 }