Merge change 4805 into donut

* changes:
  add GServices settings for Google Talk privacy and legal urls.

core/java/android/provider/Settings.java

@@ -2528,6 +2528,21 @@ public final class Settings {
          */
         public static final String GMAIL_DISCARD_ERROR_UPHILL_OP = "gmail_discard_error_uphill_op";
 
+        /**
+         * the transcoder URL for mobile devices.
+         */
+        public static final String TRANSCODER_URL = "mobile_transcoder_url";
+
+        /**
+         * URL that points to the privacy terms of the Google Talk service.
+         */
+        public static final String GTALK_PRIVACY_URL = "gtalk_privacy_url";
+
+        /**
+         * URL that points to the legal terms of the Google Talk service.
+         */
+        public static final String GTALK_LEGAL_URL = "gtalk_legal_url";
+
         /**
          * Hostname of the GTalk server.
          */