OSDN Git Service

am f1bdbdd1: resolved conflicts for merge of 08579921 to klp-modular-dev
authorGreg Hackmann <ghackmann@google.com>
Tue, 17 Dec 2013 20:09:09 +0000 (20:09 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 17 Dec 2013 20:09:09 +0000 (20:09 +0000)
commit10df052c6a6cf74ef08ed5f28a45aade07b9796d
treeaaf3a863a22b75a15fc1837875947f25d724d2ac
parentbd6877f968a83435e1f59013eb1689e1a3b54a4e
parentf1bdbdd1bea9662f6731b7a366de1f602f43e5a9
am f1bdbdd1: resolved conflicts for merge of 08579921 to klp-modular-dev

* commit 'f1bdbdd1bea9662f6731b7a366de1f602f43e5a9':
  Add timerfd backend to AlarmManagerService