am 2cb314eb: am e0cd3c19: Merge "Improve DateFormat.format."

* commit '2cb314ebc7bb6495a94f577dfb57f9e6c56033ef':
  Improve DateFormat.format.