diff --git a/samples/ApiDemos/AndroidManifest.xml b/samples/ApiDemos/AndroidManifest.xml
index e3eca81..f9f4233 100644
--- a/samples/ApiDemos/AndroidManifest.xml
+++ b/samples/ApiDemos/AndroidManifest.xml
@@ -635,6 +635,13 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".content.PickContact" android:label="@string/activity_pick_contact">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.SAMPLE_CODE" />
+            </intent-filter>
+        </activity>
+
         <!-- ************************************* -->
         <!--     OS PACKAGE SAMPLES                -->
         <!-- ************************************* -->
diff --git a/samples/ApiDemos/res/layout/pick_contact.xml b/samples/ApiDemos/res/layout/pick_contact.xml
new file mode 100644
index 0000000..c83c89e
--- /dev/null
+++ b/samples/ApiDemos/res/layout/pick_contact.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Demonstrates selecting various types of contact data. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:padding="4dip"
+    android:gravity="center_horizontal"
+    android:layout_width="match_parent" android:layout_height="match_parent">
+
+    <TextView
+        android:layout_width="match_parent" android:layout_height="wrap_content"
+        android:layout_weight="0"
+        android:paddingBottom="4dip"
+        android:text="@string/pick_contact_msg"/>
+        
+    <Button android:id="@+id/pick_contact"
+        android:layout_width="wrap_content" android:layout_height="wrap_content" 
+        android:text="@string/pick_contact">
+        <requestFocus />
+    </Button>
+
+    <Button android:id="@+id/pick_person"
+        android:layout_width="wrap_content" android:layout_height="wrap_content" 
+        android:text="@string/pick_person">
+    </Button>
+
+    <Button android:id="@+id/pick_phone"
+        android:layout_width="wrap_content" android:layout_height="wrap_content" 
+        android:text="@string/pick_phone">
+    </Button>
+
+    <Button android:id="@+id/pick_address"
+        android:layout_width="wrap_content" android:layout_height="wrap_content" 
+        android:text="@string/pick_address">
+    </Button>
+</LinearLayout>
diff --git a/samples/ApiDemos/res/values/strings.xml b/samples/ApiDemos/res/values/strings.xml
index 802fc80..4713925 100644
--- a/samples/ApiDemos/res/values/strings.xml
+++ b/samples/ApiDemos/res/values/strings.xml
@@ -246,6 +246,15 @@
     <string name="activity_themes">Content/Resources/Themes</string>
     <string name="activity_resources">Content/Resources/Resources</string>
 
+    <string name="activity_pick_contact">Content/Provider/Pick Contact</string>
+    <string name="pick_contact_msg">Invoke Contacts to pick varius kinds of
+        contact data.  None of these require that the caller hold the
+        READ_CONTACTS permission.</string>
+    <string name="pick_contact">Pick a Contact</string>
+    <string name="pick_person">Pick a Person</string>
+    <string name="pick_phone">Pick a Phone</string>
+    <string name="pick_address">Pick an Address</string>
+    
     <!-- ============================== -->
     <!--  app/intents examples strings     -->
     <!-- ============================== -->
diff --git a/samples/ApiDemos/src/com/example/android/apis/content/PickContact.java b/samples/ApiDemos/src/com/example/android/apis/content/PickContact.java
new file mode 100644
index 0000000..8ee85cc
--- /dev/null
+++ b/samples/ApiDemos/src/com/example/android/apis/content/PickContact.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.android.apis.content;
+
+// Need the following import to get access to the app resources, since this
+// class is in a sub-package.
+import com.example.android.apis.R;
+
+import android.app.Activity;
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.SystemClock;
+import android.os.Bundle;
+import android.provider.BaseColumns;
+import android.provider.ContactsContract;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.Toast;
+
+import java.util.Calendar;
+
+/**
+ * Demonstrates launching the contacts app to pick a contact.  Does not
+ * require permission to read contacts, as that permission will be granted
+ * when the selected contact is returned.
+ */
+public class PickContact extends Activity {
+    Toast mToast;
+    ResultDisplayer mPendingResult;
+
+    class ResultDisplayer implements OnClickListener {
+        String mMsg;
+        String mMimeType;
+        
+        ResultDisplayer(String msg, String mimeType) {
+            mMsg = msg;
+            mMimeType = mimeType;
+        }
+        
+        public void onClick(View v) {
+            Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+            intent.setType(mMimeType);
+            mPendingResult = this;
+            startActivityForResult(intent, 1);
+        }
+    }
+    
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.pick_contact);
+
+        // Watch for button clicks.
+        ((Button)findViewById(R.id.pick_contact)).setOnClickListener(
+                new ResultDisplayer("Selected contact",
+                        ContactsContract.Contacts.CONTENT_ITEM_TYPE));
+        ((Button)findViewById(R.id.pick_person)).setOnClickListener(
+                new ResultDisplayer("Selected person",
+                        "vnd.android.cursor.item/person"));
+        ((Button)findViewById(R.id.pick_phone)).setOnClickListener(
+                new ResultDisplayer("Selected phone",
+                        ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE));
+        ((Button)findViewById(R.id.pick_address)).setOnClickListener(
+                new ResultDisplayer("Selected address",
+                        ContactsContract.CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE));
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (data != null) {
+            Uri uri = data.getData();
+            if (uri != null) {
+                Cursor c = null;
+                try {
+                    c = getContentResolver().query(uri, new String[] { BaseColumns._ID },
+                            null, null, null);
+                    if (c != null && c.moveToFirst()) {
+                        int id = c.getInt(0);
+                        if (mToast != null) {
+                            mToast.cancel();
+                        }
+                        String txt = mPendingResult.mMsg + ":\n" + uri + "\nid: " + id;
+                        mToast = Toast.makeText(this, txt, Toast.LENGTH_LONG);
+                        mToast.show();
+                    }
+                } finally {
+                    if (c != null) {
+                        c.close();
+                    }
+                }
+            }
+        }
+    }
+}
+