Merge java_staging/src into java/src.

chrome/android/java/src/org/chromium/chrome/browser/gsa/GSAHelper.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.gsa;
 
 import android.content.Context;
 import android.os.Bundle;
 
 import org.chromium.chrome.browser.ChromeActivity;
@@ skipping 29 matching lines @@
 
     /**
      * Extracts the logged in account from a given gsaState.
      * @param gsaState The GSA state byte array that contains the account information.
      * @return The account that GSA is currently logged in to. Can be null.
      */
     public String getGSAAccountFromState(byte[] gsaState) {
         return null;
     }
 }