Merge "Limit the list of settings that can have shortcuts on home."

author Amith Yamasani <yamasani@google.com>

Mon, 1 Aug 2011 21:49:16 +0000 (14:49 -0700)

committer Android (Google) Code Review <android-gerrit@google.com>

Mon, 1 Aug 2011 21:49:16 +0000 (14:49 -0700)
author Amith Yamasani <yamasani@google.com>
Mon, 1 Aug 2011 21:49:16 +0000 (14:49 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 1 Aug 2011 21:49:16 +0000 (14:49 -0700)
diff --cc AndroidManifest.xml
Simple merge
diff --cc res/values/strings.xml
Simple merge
author	Amith Yamasani <yamasani@google.com>
	Mon, 1 Aug 2011 21:49:16 +0000 (14:49 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 1 Aug 2011 21:49:16 +0000 (14:49 -0700)
		1	2
AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history