Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1

Conflicts:
	core/java/android/provider/Settings.java

Change-Id: Ief5f82ebdf66216ea41bd66dc0420a334f412917
Merge branch 'cm-10.1' into CM10.1

Conflicts:
	core/java/android/provider/Settings.java