OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 67cda1a 41773d4)
am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when...
authorEric Laurent <elaurent@google.com>
Tue, 24 Jan 2012 19:51:47 +0000 (11:51 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 24 Jan 2012 19:51:47 +0000 (11:51 -0800)
commitdd347d515d4a4e42b2aba89a8e471392026b7824
tree9c66ad628619c851ad9ca802cb2ba61b446d771btree | snapshot
parent67cda1a0ec2f443293d0ada7c49708ff4a11c8c7commit | diff
parent41773d46556aa47d4322ff89fdaf7d1345c2d1f2commit | diff
am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1

* commit '41773d46556aa47d4322ff89fdaf7d1345c2d1f2':
  DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
services/audioflinger/AudioFlinger.cpp diff1 | diff2 | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help