commit 42007e34be43227665a8fda735a582cc5e122c17
author Winson Chung <winsonc@google.com> Mon Jan 11 20:18:47 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 11 20:18:47 2016 +0000
tree b2eb48d28517441df980682eba55c45bfd532a85
parent 9d46b3efd71f98063d050d087533020680e93d25
parent 94a0e89adb30b050f4b3319d93753b34d48e8490

Merge "Simplifying the task header highlight drawing."

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index db85c9a..42e72e3 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -31369,6 +31369,7 @@
     field public static final java.lang.String AUTO_TIME = "auto_time";
     field public static final java.lang.String AUTO_TIME_ZONE = "auto_time_zone";
     field public static final java.lang.String BLUETOOTH_ON = "bluetooth_on";
+    field public static final java.lang.String CONTACT_METADATA_SYNC = "contact_metadata_sync";
     field public static final android.net.Uri CONTENT_URI;
     field public static final java.lang.String DATA_ROAMING = "data_roaming";
     field public static final java.lang.String DEBUG_APP = "debug_app";

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 929538d..b34a7f4 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -33505,6 +33505,7 @@
     field public static final java.lang.String AUTO_TIME = "auto_time";
     field public static final java.lang.String AUTO_TIME_ZONE = "auto_time_zone";
     field public static final java.lang.String BLUETOOTH_ON = "bluetooth_on";
+    field public static final java.lang.String CONTACT_METADATA_SYNC = "contact_metadata_sync";
     field public static final android.net.Uri CONTENT_URI;
     field public static final java.lang.String DATA_ROAMING = "data_roaming";
     field public static final java.lang.String DEBUG_APP = "debug_app";

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index 8944fa4..bcab75b 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -31381,6 +31381,7 @@
     field public static final java.lang.String AUTO_TIME = "auto_time";
     field public static final java.lang.String AUTO_TIME_ZONE = "auto_time_zone";
     field public static final java.lang.String BLUETOOTH_ON = "bluetooth_on";
+    field public static final java.lang.String CONTACT_METADATA_SYNC = "contact_metadata_sync";
     field public static final android.net.Uri CONTENT_URI;
     field public static final java.lang.String DATA_ROAMING = "data_roaming";
     field public static final java.lang.String DEBUG_APP = "debug_app";

core/java/android/provider/Settings.java

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index a006674..d4c9944 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -8288,7 +8288,6 @@
         /**
          * Whether to enable contacts metadata syncing or not
          * The value 1 - enable, 0 - disable
-         * @hide
          */
         public static final String CONTACT_METADATA_SYNC = "contact_metadata_sync";