Frameworks: fix lunar

Change-Id: Id719150a2fc9d08fd96a019977a64cb9dcc3a9ae

Conflicts:
	core/res/res/values-zh-rTW/arrays.xml
Frameworks: fix lunar

Change-Id: Iea5190b7d863735ac77987be1db8d2912de1a8d7

Conflicts:
	core/res/res/values-zh-rTW/arrays.xml
Frameworks: fix fuck lunar display when The Spring Festival

Change-Id: Ibde641dbff5244f4796d53e59e0fb744199f7331
Option to Show Carrier Label in Statusbar (1/2)

Conflicts:
	packages/SystemUI/res/values/styles.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/CarrierLabel.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java

Change-Id: I84a449e39df7b66a675e00afce79bee558437a49
Carrier Label Color (1/2)

properly impl.

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/CarrierLabel.java

Change-Id: If211f4d6fb7cc1b6f603dbe75f93ca7faed5401c