am 087b25f7: am 6e4895b6: Merge "Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681" into froyo

Merge commit '087b25f7e2669497cf217d873437e8726c139abd' into kraken

* commit '087b25f7e2669497cf217d873437e8726c139abd':
  Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681