Merge change 4805 into donut

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

1 files changed, 15 insertions, 0 deletions

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 924644580c45..2aa664000c44 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2529,6 +2529,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.
          */
         public static final String GTALK_SERVICE_HOSTNAME = "gtalk_hostname";