merge changes from CyanogenMod 10.2 into local branch

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java

Change-Id: I30b20b0067550e990aa0fc98417f6a5374613415