tree b9dcdde93766f56841bfd2da6850e388c447a985
parent c369f1993b41dac8ac1a005b3bc9312dfa5ebd63
parent 08a140e6a3989ece3854014123dac243cc372886
author Benoit Goby <benoit@android.com> 1389325051 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389325051 -0800

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

* commit '08a140e6a3989ece3854014123dac243cc372886':
  toolbox: Fix date tool with /dev/alarm