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

* commit '21d3f294831f7a15c5e746b3dae3e6ec0de883a8':
  use Calendar in DateUtils format method