am f2335642: Merge change I7fb3bc59 into eclair

Merge commit 'f233564284d492815b1f45f6f2bd66d96b77d9ea' into eclair-plus-aosp

* commit 'f233564284d492815b1f45f6f2bd66d96b77d9ea':
  Add new date formats for the lock screen.