am ca750b90: am 9d675804: Cancel the snooze if the user sets an alarm for before the snooze fires.

Merge commit 'ca750b900ba29eb6be1de181ddd1c86db38ead82'

* commit 'ca750b900ba29eb6be1de181ddd1c86db38ead82':
  Cancel the snooze if the user sets an alarm for before the snooze fires.
tree: 050e772217bc17fe256a0bcb97d6a775d8aed839
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE