fix c++ syntax

Change-Id: I083ae4ce6b0f4be70207c7153208731195f43cbb
base: show notification count overlay

Change-Id: Ie4df927531bd8d2869780336b5657f8194141b42
Status bar brightness control from CM10 (Frameworks portion)

Change-Id: Ida526bf19e56d549f7cc75c47466e6953295d888

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java