tree d0f42664fca535db691305453ee547d6553728be
parent d71a7ffd3341742b7de0ff12bdfcae28a33def73
parent 14b0da749c73c1e0201adee1b398a1955b7d624e
author Narayan Kamath <narayan@google.com> 1394561769 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394561769 +0000

am 14b0da74: Merge "Set 24 hour pref. with ACTION_TIME_CHANGED."

* commit '14b0da749c73c1e0201adee1b398a1955b7d624e':
  Set 24 hour pref. with ACTION_TIME_CHANGED.