am b054d81b: am 6b98d006: am 1196a729: Merge change I63863614 into eclair

Merge commit 'b054d81b5e6d84dfd9e37dce750e6c51a4a8e40f'

* commit 'b054d81b5e6d84dfd9e37dce750e6c51a4a8e40f':
  Continued UI fit-and-finish for DeskClock.