[Sync] //components/sync manual changes [DO NOT SUBMIT]

components/sync/android/java/src/org/chromium/components/sync/notifier/InvalidationPreferences.java

 // Copyright 2013 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.components.sync.notifier;
 
 import android.accounts.Account;
 import android.content.SharedPreferences;
 import android.util.Base64;
 
@@ skipping 59 matching lines @@
         @VisibleForTesting
         public static final String SYNC_ACCT_NAME = "sync_acct_name";
 
         /** Shared preference key to store the type of account in use. */
         static final String SYNC_ACCT_TYPE = "sync_acct_type";
 
         /** Shared preference key to store internal notification client library state. */
         static final String SYNC_TANGO_INTERNAL_STATE = "sync_tango_internal_state";
     }
 
-    private static final String TAG = "InvalidationPreferences";
+    private static final String TAG = "InvalidationPrefs";
 
     // Only one commit call can be in progress at a time.
     private static final Object sCommitLock = new Object();
 
     /** Returns a new {@link EditContext} to modify the preferences managed by this class. */
     public EditContext edit() {
         return new EditContext();
     }
 
     /**
@@ skipping 109 matching lines @@
         int objectSource;
         try {
             objectSource = Integer.parseInt(objectIdString.substring(0, separatorPos));
         } catch (NumberFormatException e) {
             return null;
         }
         byte[] objectName = objectIdString.substring(separatorPos + 1).getBytes();
         return ObjectId.newInstance(objectSource, objectName);
     }
 }