| commit | 10df052c6a6cf74ef08ed5f28a45aade07b9796d | [log] [tgz] |
|---|---|---|
| author | Greg Hackmann <ghackmann@google.com> | Tue Dec 17 20:09:09 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 17 20:09:09 2013 +0000 |
| tree | aaf3a863a22b75a15fc1837875947f25d724d2ac | |
| parent | bd6877f968a83435e1f59013eb1689e1a3b54a4e [diff] | |
| parent | f1bdbdd1bea9662f6731b7a366de1f602f43e5a9 [diff] |
am f1bdbdd1: resolved conflicts for merge of 08579921 to klp-modular-dev * commit 'f1bdbdd1bea9662f6731b7a366de1f602f43e5a9': Add timerfd backend to AlarmManagerService