am 64a1a901: am 87ce99ca: am ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24."

* commit '64a1a901dcd9b3103cc63d5c20de9af6db9d1ada':
  Migrate off timeFormat12 and timeFormat24.
This commit is contained in:
Elliott Hughes
2014-10-29 17:37:29 +00:00
committed by Android Git Automerger

Diff Content Not Available