From: Elliott Hughes <enh@google.com>
Date: Tue, 4 Mar 2014 01:11:01 +0000 (+0000)
Subject: am fea778b3: am 2c7c79e6: Merge "Switch to upstream alarm(3)."
X-Git-Tag: android-x86-6.0-r1~1708
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=010d0902411fef734d580ff7ab86ce816b05cbe9;p=android-x86%2Fbionic.git

am fea778b3: am 2c7c79e6: Merge "Switch to upstream alarm(3)."

* commit 'fea778b308be2dd0d75bd757129c3ef62ace3a61':
  Switch to upstream alarm(3).
---

010d0902411fef734d580ff7ab86ce816b05cbe9