am 7c1e8dbd: am 21d3f294: Merge "use Calendar in DateUtils format method"

* commit '7c1e8dbd3159c88df27d24aa2699358ee139d49b':
  use Calendar in DateUtils format method