Camera Key description

Change-Id: Ic9a22448c16428fc2f311ea813aa2ec5f27493db
Missing break in switch statement

Change-Id: I462c0c5fec96a850032266b04419ec409ad02174
Framework: Add option to always show battery status on lockscreen (1/2)

Based on the feature by burnsra in CM7
Authored by Blunden
Tweaked by DvTonder
Change-Id: I642da4dcd82a776a74d77031d37acc76f97b25af

lockscreen battery status: add off option (2/2)
Change-Id: Ie10015865f161e783dc394d467e456d51dc9fbbc

Conflicts:

	core/java/android/provider/Settings.java
	packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java