am 84d495af: am 23bff5dd: Add API demo for picking a contact with a permission grant.

author Dianne Hackborn <hackbod@google.com>

Thu, 2 Sep 2010 21:52:45 +0000 (14:52 -0700)

committer Android Git Automerger <android-git-automerger@android.com>

Thu, 2 Sep 2010 21:52:45 +0000 (14:52 -0700)
author Dianne Hackborn <hackbod@google.com>
Thu, 2 Sep 2010 21:52:45 +0000 (14:52 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 2 Sep 2010 21:52:45 +0000 (14:52 -0700)
diff --cc samples/ApiDemos/AndroidManifest.xml
Simple merge
diff --cc samples/ApiDemos/res/values/strings.xml
Simple merge
author	Dianne Hackborn <hackbod@google.com>
	Thu, 2 Sep 2010 21:52:45 +0000 (14:52 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 2 Sep 2010 21:52:45 +0000 (14:52 -0700)
		1	2
samples/ApiDemos/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
samples/ApiDemos/res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history