tree 25a318e80ef1a3c80b849b0926ef91fa90f9bc6d
parent ef3a0be922618334645b7f9b5e3ab719f3578b92
parent 7f1c81b7b58a6a938494ed8f06d9fcf915226ba1
author Narayan Kamath <narayan@google.com> 1393502707 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393502707 +0000

am 7f1c81b7: Merge "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""

* commit '7f1c81b7b58a6a938494ed8f06d9fcf915226ba1':
  Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."