OSDN Git Service

(root) / android-x86 / frameworks-av.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b85a114 eaa0b5c)
am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when...
authorEric Laurent <elaurent@google.com>
Tue, 24 Jan 2012 19:51:15 +0000 (11:51 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 24 Jan 2012 19:51:15 +0000 (11:51 -0800)
commit52eccc1b3f033e25b5bac92effa03953bf919ad1
tree2c8839181a434754e4fc7de1c911643754614c59tree | snapshot
parentb85a11467b3d46cb275fcc0d866619d36cda8662commit | diff
parenteaa0b5cc2f7723e9b25298126d0dcb48c56d5daccommit | 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
services/audioflinger/AudioFlinger.h diff1 | diff2 | blob | history
frameworks/av
About OSDN
Find Software
Develop Software
Help