tree 3034ba6466cc2b82d33fb769a97530ad0962b264
parent 542b55d9a4bee2f98f8a0a6948e0873c5faaddc7
parent 0cab896a987f6687affd5c50c3bdbe10745c8dff
author Greg Hackmann <ghackmann@google.com> 1393029772 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393029772 +0000

am 0cab896a: resolved conflicts for merge of 9e413bf4 to klp-modular-dev-plus-aosp

* commit '0cab896a987f6687affd5c50c3bdbe10745c8dff':
  open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
  Move time setting code from SystemClock to AlarmManagerService