am ff1c25c3: Merge change I7ea1d183 into eclair
am ff1c25c3: Merge change I7ea1d183 into eclair

Merge commit 'ff1c25c3be3934c2e7f0c3b338a204a582446894' into eclair-mr2

* commit 'ff1c25c3be3934c2e7f0c3b338a204a582446894':
  Alarm Clock is now simply Clock.

dseuss/deskclock,dseuss/deskclock,OrBin/SynClock-Android