Merge commit 'df54392f846881654a73c8b287cee3c5f299d31e' into eclair-mr2-plus-aosp * commit 'df54392f846881654a73c8b287cee3c5f299d31e': Use new date format for lock screen.