am 2bf7a17b: am 491b8f3b: Pull the change from DeskClock into AlarmClock.

Merge commit '2bf7a17be05fe433e1126da6689e3e9c1eed9e99'

* commit '2bf7a17be05fe433e1126da6689e3e9c1eed9e99':
  Pull the change from DeskClock into AlarmClock.
tree: 661e224733586c82a8ab904ea4eb198879aa3296
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE