Merge "SystemUI: SK translations" into cm-10.2
QuickSettings : Fix update issue if linked

Currently ribbon does not reflect updates to QS if they're linked.
This patchset addresses that.

Change-Id: I3787c30892c13dbcb7e5c48ff99cd2220b638302

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