tree 975d51553e6b75911c33aca548bf99868a43edd4
parent ec7894cf5c08737f5dccacf462dd47c324309c64
parent 709543a96836be5f1c10e4051ec6207dec72cd08
author Benoit Goby <benoit@android.com> 1389325204 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389325204 +0000

am 709543a9: am 08a140e6: Merge "toolbox: Fix date tool with /dev/alarm"

* commit '709543a96836be5f1c10e4051ec6207dec72cd08':
  toolbox: Fix date tool with /dev/alarm