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:
f06a99b
7c5aea0
)
am dd347d51: (-s ours) am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger...
author
Eric Laurent
<elaurent@google.com>
Wed, 25 Jan 2012 16:57:20 +0000
(08:57 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 25 Jan 2012 16:57:20 +0000
(08:57 -0800)
* commit '
dd347d515d4a4e42b2aba89a8e471392026b7824
':
DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
Trivial merge