tree 86bf0ac4e39caf9e4ef567f310a2fa07ce3e779d
parent 4a3a0edce1d548c03fb18a012d90ce929a41ceb9
parent 58c4a7ddf227bd6977677f4c8046eab6376477b3
author Benoit Goby <benoit@android.com> 1389325409 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389325409 +0000

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

* commit '58c4a7ddf227bd6977677f4c8046eab6376477b3':
  toolbox: Fix date tool with /dev/alarm