am 3541fb38: am cf8de265: Merge "Teach the DateFormat test that we\'ve deliberately broken \'k\'."

* commit '3541fb38553271af45d2726eeceeceab6ffc8463':
  Teach the DateFormat test that we've deliberately broken 'k'.