Added German string for discharging information on lockscreen when enabled

Change-Id: I5b3c0c6c1a6185c2069feffe9bf426acbc7de178
Signed-off-by: andryyy <apeters87@gmail.com>
Show dock battery level if available

Updated for Jellybean.

Change-Id: Iabfd12eb327a9fe32ffa46eea5c9038263e105a9
frameworks: add dock battery drawables for HDPI devices

Change-Id: I8cc2cfc74548693ffbdd48447d7fa414fd451f59
Merge "Show dock battery level if available" into cm-10.1
Merge "frameworks: add dock battery drawables for HDPI devices" into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_base into cm-10.1

Conflicts:
	packages/SystemUI/res/layout/status_bar.xml