am 35b7b0b8: Merge "Add system setting key for dialpad autocomplete" into jb-mr2-dev

* commit '35b7b0b80000774b503f7d06bf3685836f22608f':
  Add system setting key for dialpad autocomplete

core/java/android/provider/Settings.java

@@ -4075,6 +4075,13 @@ public final class Settings {
          */
         public static final String ENABLED_NOTIFICATION_LISTENERS = "enabled_notification_listeners";
 
+        /**
+         * Whether or not to enable the dial pad autocomplete functionality.
+         *
+         * @hide
+         */
+        public static final String DIALPAD_AUTOCOMPLETE = "dialpad_autocomplete";
+
         /**
          * This are the settings to be backed up.
          *
@@ -4115,7 +4122,8 @@ public final class Settings {
             MOUNT_UMS_AUTOSTART,
             MOUNT_UMS_PROMPT,
             MOUNT_UMS_NOTIFY_ENABLED,
-            UI_NIGHT_MODE
+            UI_NIGHT_MODE,
+            DIALPAD_AUTOCOMPLETE
         };
 
         /**