am 2f4c9bab: am 50e64e83: Merge "Add a unit test for a DateUtils bug I already fixed."

* commit '2f4c9babd90e14fab3c0fd6d01baec68a3e3d9f7':
  Add a unit test for a DateUtils bug I already fixed.