am 36f47885: am 90181ef5: am 42602143: Merge "Add a short date format that\'s guaranteed to have 4-digit years."

* commit '36f47885472f6a8829f5ddf880e6a0136bae879e':
  Add a short date format that's guaranteed to have 4-digit years.