Merge branch 'halo' of https://github.com/xjcook/android_frameworks_base into halo

Conflicts:
	core/java/android/app/INotificationManager.aidl
	packages/SystemUI/res/values/pa_strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	services/java/com/android/server/NotificationManagerService.java

Change-Id: Ic87ca396ffaf83f7d7431b0ea8e391efee9c6517