Merge remote-tracking branch 'pa/jellybean' into jellybean

Signed-off-by: Evan Anderson <evan1124@gmail.com>

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/res/values/strings.xml

Change-Id: Ia41d650ee9362debc6b190dfbe84934cbeb30525