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

Conflicts:
	packages/SystemUI/res/values/strings.xml

Change-Id: I8da1b468be5261863cd79da0db32bc7633468573
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_base into HEAD
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
Merge branch 'cm-10.1' into CM10.1

Conflicts:
	packages/SystemUI/res/values/strings.xml