Fix Android 4.3 Merge (Take 3)
Merge remote-tracking branch 'revolt/jb-mr2' into jb-mr2

Conflicts:
	src/com/android/settings/DateTimeSettings.java
	src/com/android/settings/Settings.java
	src/com/android/settings/deviceinfo/MiscFilesHandler.java
Merge remote-tracking branch 'revolt/jb-mr2' into jb-mr2

Conflicts:
	src/com/android/settings/DateTimeSettings.java