resolved conflicts for merge of 4ea6a8eb to jb-mr1-dev

Change-Id: I51b1732011f31ea07087ef0898b47de8977074de

core/java/android/widget/Switch.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -664,7 +664,7 @@ public class Switch extends CompoundButton {
		@Override
		public void setChecked(boolean checked) {
		super.setChecked(checked);
		setThumbPosition(checked);
		setThumbPosition(isChecked());
		invalidate();
		}