am c575e007: Merge "setShowGTalkServiceStatus() is deprecated but tested by CTS" into jb-mr1-dev

* commit 'c575e007e59e00db7c1f3f2b2ea57cc24dd7c2de':
  setShowGTalkServiceStatus() is deprecated but tested by CTS
This commit is contained in:
Christopher Tate
2012-09-20 06:08:45 -07:00
committed by Android Git Automerger

View File

@@ -1338,7 +1338,7 @@ public final class Settings {
/** @deprecated - Do not use */
@Deprecated
public static void setShowGTalkServiceStatus(ContentResolver cr, boolean flag) {
/* intentionally empty */
setShowGTalkServiceStatusForUser(cr, flag, UserHandle.myUserId());
}
/**