tree 26aec9a5b44e0560e25dd7437c9ac6f2cb9eebf0
parent f33df6a662934cd72a79195773d2745ae8f937d4
parent aedb00d04eb7f0b20b6abde702ba94a46577ca68
author Elliott Hughes <enh@google.com> 1393894733 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1393894733 +0000

Merge "Switch to upstream alarm(3)."