am c9e0cd2a: Merge "Fix DateFormat k and h, and implement K and H for the first time."

* commit 'c9e0cd2ac7b1df3e60f0ca8bab6a7240bade07d9':
  Fix DateFormat k and h, and implement K and H for the first time.