Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_base into cm-10.1

Conflicts:
	packages/SystemUI/AndroidManifest.xml
HALO bugfixes

1. some icons were overblown
2. tasking meant having your thumb on the speechbubbles

Change-Id: I04637a5ae96c3d9fa30188a320e13989c48f7f0c

Conflicts:

	packages/SystemUI/res/values/strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
Merge remote-tracking branch 'temasek/cm-10.1' into cm-10.1