am 29bed78d: am add37ef4: am 5f6e4339: Merge "Use SimpleDateFormat for time zone formatting."

* commit '29bed78df624789d951eb6f491742bd29d7859ff':
  Use SimpleDateFormat for time zone formatting.