am 9f431335: merge from froyo-plus-aosp

Merge commit '9f431335ab377396713b8b386ad7539b2b28eff5'

* commit '9f431335ab377396713b8b386ad7539b2b28eff5':
  generic.mk: Replaced AlarmClock with newer DeskClock App