OSDN Git Service

am fea778b3: am 2c7c79e6: Merge "Switch to upstream alarm(3)."
authorElliott Hughes <enh@google.com>
Tue, 4 Mar 2014 01:11:01 +0000 (01:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 Mar 2014 01:11:01 +0000 (01:11 +0000)
* commit 'fea778b308be2dd0d75bd757129c3ef62ace3a61':
  Switch to upstream alarm(3).


Trivial merge