tree 0328af2bf3a39d465ce200721f20043a1aa47aeb
parent 7a6e8c9adcb7fa46a16fe930c1c81c94f2a0daef
parent e3cd2168886b581b091f0912795ee8077fc94e53
author Benoit Goby <benoit@android.com> 1389325286 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389325286 +0000

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

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