am 5c4d941d: am acb426ab: Remove resource conflicts in datetimepicker
am 5c4d941d: am acb426ab: Remove resource conflicts in datetimepicker

* commit '5c4d941d30f58c2ac94490feb0b37be90cbfd904':
  Remove resource conflicts in datetimepicker

keima/datetimepicker,seesaa/datetimepicker-android,seesaa/datetimepicker-android,keima/datetimepicker