tree 1905f7b970526d9346a6ec978f2e282280bed20b
parent bb988d28d047470b035f0a704e96bf8fc971da89
parent ea9f0d606e72c4e00baac15fdf0eb0abd3da286e
author James Lemieux <jplemieux@google.com> 1441132974 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441132974 +0000

am ea9f0d60: Merge "Simplify code that adds None as a valid timer ringtone" into ub-deskclock-charm

* commit 'ea9f0d606e72c4e00baac15fdf0eb0abd3da286e':
  Simplify code that adds None as a valid timer ringtone