Merge change 5316

* changes:
  add Gservices setting for data messaging app token url.

core/java/android/provider/Settings.java

@@ -2755,6 +2755,12 @@ public final class Settings {
         public static final String GTALK_MAX_RETRIES_FOR_AUTH_EXPIRED =
             "gtalk_max_retries_for_auth_expired";
 
+        /**
+         * This is the url for getting the app token for server-to-device data messaging.
+         */
+        public static final String DATA_MESSAGE_GET_APP_TOKEN_URL =
+                "data_messaging_get_app_token_url";
+        
         /**
          * Enable use of ssl session caching.
          * 'db' - save each session in a (per process) database