am a3a96d18: am bb8fc4a4: am 9fc039e7: Merge "Add a preference panel for mouse speed...

author Jeff Brown <jeffbrown@android.com>

Fri, 3 Jun 2011 22:30:16 +0000 (15:30 -0700)

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

Fri, 3 Jun 2011 22:30:16 +0000 (15:30 -0700)
author Jeff Brown <jeffbrown@android.com>
Fri, 3 Jun 2011 22:30:16 +0000 (15:30 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 3 Jun 2011 22:30:16 +0000 (15:30 -0700)
diff --cc AndroidManifest.xml
Simple merge
diff --cc res/values/strings.xml
Simple merge
diff --cc res/xml/language_settings.xml
Simple merge
author	Jeff Brown <jeffbrown@android.com>
	Fri, 3 Jun 2011 22:30:16 +0000 (15:30 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 3 Jun 2011 22:30:16 +0000 (15:30 -0700)
		1	2
AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
res/xml/language_settings.xml	patch \|	diff1 \|	diff2 \|	blob \| history