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:
bb92112
620208d
)
audio: prevent larger than required sleeps - DO NOT MERGE
author
Chris Elliott
<chriselliott@google.com>
Tue, 28 Oct 2014 23:27:51 +0000
(23:27 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 28 Oct 2014 23:27:51 +0000
(23:27 +0000)
automerge:
620208d
-s ours
* commit '
620208dc0bbd7a0792702df3ab08800fdad60cec
':
audio: prevent larger than required sleeps - DO NOT MERGE
Trivial merge