Revert "Revert "Merge remote-tracking branch 'upstream/jellybean' into HEAD""

This reverts commit 865a6e8abe8958df3a348195f013ed73f6b051da.

Conflicts:

	core/java/android/provider/Settings.java
	core/res/res/values/config.xml

Change-Id: I79cfcc819b0f064f02dfcff1d65be426f9abe5f3