OSDN Git Service

DO NOT MERGE Revert "DO NOT MERGE Use POSIX timer API for wake alarms instead of...
authorScott James Remnant <keybuk@google.com>
Tue, 20 Oct 2015 02:22:40 +0000 (02:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Oct 2015 02:22:40 +0000 (02:22 +0000)
am: 43838819bc  -s ours

* commit '43838819bc791d08cf087527e9ec4937bf516004':
  DO NOT MERGE Revert "DO NOT MERGE Use POSIX timer API for wake alarms instead of OSI callouts."


Trivial merge