am 31db8c22: am 7468e218: Update lock screen alarm info when the locale changes.
am 31db8c22: am 7468e218: Update lock screen alarm info when the locale changes.

Merge commit '31db8c2298ed1bf32d8fd92fafef9c01f233d7df'

* commit '31db8c2298ed1bf32d8fd92fafef9c01f233d7df':
  Update lock screen alarm info when the locale changes.

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