Added Center-Clock Option, Battery-Mod, Changelog, Build-Version, OTA-Update-Function
Revert some changes
rebase
revert the revert
Fix build error
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
Fixed merging conflict
Merge remote-tracking branch upstream/cm-10.1 into cm-10.1 and fixed conflicts
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
Added navigation bar custom height
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
System settings: Added navigation bar preference screen and Moved "navigation bar customization" and "navigation bar height" to the navigation bar preference screen
Added catergories to System settings -> "About phone and sorted preferences, System settings -> "About phone" to the new catergories
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
About phone: Added/Changed strings for CyanogenMod/"Dark Jelly Edition" Changelog, and OTA Updates