OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b2c3ad1
b6dcdbf
)
Revert "audio: prevent larger than required sleeps - DO NOT MERGE"
author
Chris Elliott
<chriselliott@google.com>
Tue, 28 Oct 2014 23:27:54 +0000
(23:27 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 28 Oct 2014 23:27:54 +0000
(23:27 +0000)
automerge:
b6dcdbf
-s ours
* commit '
b6dcdbf436ffacb52a41ac8ef9b07f99fd64779f
':
Revert "audio: prevent larger than required sleeps - DO NOT MERGE"
Trivial merge