am c5c6d416: am 6317315e: Merge "Deliberately break DateFormat.format\'s formatting of \'k\' for compatibility."

* commit 'c5c6d4167b66c79652c5208a2dfe091a8c735e6d':
  Deliberately break DateFormat.format's formatting of 'k' for compatibility.