From: Elliott Hughes <enh@google.com>
Date: Tue, 4 Mar 2014 00:58:53 +0000 (+0000)
Subject: Merge "Switch to upstream alarm(3)."
X-Git-Tag: android-x86-7.1-r1~757^2~1353
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2c7c79e6;p=android-x86%2Fbionic.git

Merge "Switch to upstream alarm(3)."
---

2c7c79e6e5e730553281b6d42e734ee2c532a660