diff --git a/api/current.xml b/api/current.xml
index 19066f73db1f7..e31e3f95e3be9 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -41061,6 +41061,17 @@
 <parameter name="key" type="java.lang.String">
 </parameter>
 </method>
+<method name="keySet"
+ return="java.util.Set&lt;java.lang.String&gt;"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="put"
  return="void"
  abstract="false"
diff --git a/core/java/android/content/ContentValues.java b/core/java/android/content/ContentValues.java
index 75787cd34610e..e6dedc1372230 100644
--- a/core/java/android/content/ContentValues.java
+++ b/core/java/android/content/ContentValues.java
@@ -446,6 +446,15 @@ public final class ContentValues implements Parcelable {
         return mValues.entrySet();
     }
 
+    /**
+     * Returns a set of all of the keys
+     *
+     * @return a set of all of the keys
+     */
+    public Set<String> keySet() {
+        return mValues.keySet();
+    }
+
     public static final Parcelable.Creator<ContentValues> CREATOR =
             new Parcelable.Creator<ContentValues>() {
         @SuppressWarnings({"deprecation", "unchecked"})