am 33f52f1e: am f104c2f9: Merge "Cancel the date picker dialog when BUTTON_NEGATIVE is clicked" into lmp-dev

* commit '33f52f1e6fba8b0cdcdefaff9bc8199f4021c48a':
  Cancel the date picker dialog when BUTTON_NEGATIVE is clicked