Merge "Settings for the screen magnification feature." into jb-mr1-dev

author Svetoslav Ganov <svetoslavganov@google.com>

Fri, 7 Sep 2012 23:20:36 +0000 (16:20 -0700)

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

Fri, 7 Sep 2012 23:20:37 +0000 (16:20 -0700)
author Svetoslav Ganov <svetoslavganov@google.com>
Fri, 7 Sep 2012 23:20:36 +0000 (16:20 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 7 Sep 2012 23:20:37 +0000 (16:20 -0700)
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/settings/DevelopmentSettings.java
Simple merge
author	Svetoslav Ganov <svetoslavganov@google.com>
	Fri, 7 Sep 2012 23:20:36 +0000 (16:20 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 7 Sep 2012 23:20:37 +0000 (16:20 -0700)
		1	2
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/DevelopmentSettings.java	patch \|	diff1 \|	diff2 \|	blob \| history