numberpatch

Change-Id: I81cbf944abb29d265f65767e71bb491dcf94b79f

Conflicts:
	packages/SystemUI/res/layout/halo_bubble.xml
	packages/SystemUI/src/com/android/systemui/statusbar/halo/Halo.java