OSDN Git Service
(root)
/
android-x86
/
system-bt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
12fcbb2
4383881
)
DO NOT MERGE Revert "DO NOT MERGE Use POSIX timer API for wake alarms instead of...
author
Scott James Remnant
<keybuk@google.com>
Tue, 20 Oct 2015 20:23:41 +0000
(20:23 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 20 Oct 2015 20:23:41 +0000
(20:23 +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