core: zh-rTW translations

PS3: rebase
PS4: rebase and fix a string

Change-Id: Ib0196235db96c93d5ffd6deef6593e473a0a0281
Add battery level around unlock ring…

[1/2] [log]

Change-Id: I8447e76b31c6ef00084c6c1b421f75a2e73f911b

Conflicts:
	core/java/android/provider/Settings.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java
Active display: Make GlowPadView center the current notification icon for us

sudo makemeasandwich

ps2: make scaling both smarter and stupider SIMULTANEOUSLY

Change-Id: I582f387fd3c1c83f2bbd0d31a4b43e22d1b82d63
Signed-off-by: nuclearmistake <nuclearmistake@gmail.com>
Add HALO QS tile…

[1/2] [log]

Change-Id: I0db940cfc61da97d97b5113f8cd992a79a2f21bd
merge changes from CyanogenMod 10.2 into local branch

Conflicts:
	core/res/res/values-zh-rTW/cm_strings.xml

Change-Id: If96468489de2a4ac15401315ad17b46dbd6ef532
Active display: Allow apps to be excluded from being displayed…

[1/2] [log]

This has been a highly requested feature so I guess it's about time
we implement it :).

Change-Id: I5c334833b78325733ae076c07afccebb02758ead

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/activedisplay/ActiveDisplayView.java
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2