OSDN Git Service

am dd347d51: (-s ours) am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger...
authorEric Laurent <elaurent@google.com>
Wed, 25 Jan 2012 16:57:20 +0000 (08:57 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 25 Jan 2012 16:57:20 +0000 (08:57 -0800)
commit9c7d56a78ba819fdc8046ab87c82ee2b57d200b5
tree9a2b57c6a390d36dba8982e7c1742c81c69307b9
parentafacb33f7584ca2f762c2d15472917059c0e9503
parentdd347d515d4a4e42b2aba89a8e471392026b7824
am dd347d51: (-s ours) am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1

* commit 'dd347d515d4a4e42b2aba89a8e471392026b7824':
  DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""