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

* commit 'a2e1535135bfc80bf2a4055fa465f3c875dd9edc':
  Remove resource conflicts in datetimepicker

seesaa/datetimepicker-android,seesaa/datetimepicker-android