Merge "Adding temporary setting for enabling touch exploration."

author Svetoslav Ganov <svetoslavganov@google.com>

Mon, 18 Jul 2011 19:57:35 +0000 (12:57 -0700)

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

Mon, 18 Jul 2011 19:57:35 +0000 (12:57 -0700)
author Svetoslav Ganov <svetoslavganov@google.com>
Mon, 18 Jul 2011 19:57:35 +0000 (12:57 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 18 Jul 2011 19:57:35 +0000 (12:57 -0700)
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/settings/AccessibilitySettings.java
Simple merge
author	Svetoslav Ganov <svetoslavganov@google.com>
	Mon, 18 Jul 2011 19:57:35 +0000 (12:57 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 18 Jul 2011 19:57:35 +0000 (12:57 -0700)
		1	2
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/AccessibilitySettings.java	patch \|	diff1 \|	diff2 \|	blob \| history