am edef6cce: Use public bookmark permissions.

author Leon Scroggins <scroggo@google.com>

Mon, 22 Jun 2009 15:03:43 +0000 (08:03 -0700)

committer The Android Open Source Project <initial-contribution@android.com>

Mon, 22 Jun 2009 15:03:43 +0000 (08:03 -0700)
author Leon Scroggins <scroggo@google.com>
Mon, 22 Jun 2009 15:03:43 +0000 (08:03 -0700)
committer The Android Open Source Project <initial-contribution@android.com>
Mon, 22 Jun 2009 15:03:43 +0000 (08:03 -0700)
diff --cc AndroidManifest.xml
Simple merge
diff --cc res/values/strings.xml
Simple merge
author	Leon Scroggins <scroggo@google.com>
	Mon, 22 Jun 2009 15:03:43 +0000 (08:03 -0700)
committer	The Android Open Source Project <initial-contribution@android.com>
	Mon, 22 Jun 2009 15:03:43 +0000 (08:03 -0700)
		1	2
AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history