OSDN Git Service

am 9c7d56a7: am dd347d51: (-s ours) am 41773d46: Merge "DO NOT MERGE Revert "Revert...
authorEric Laurent <elaurent@google.com>
Wed, 25 Jan 2012 17:00:52 +0000 (09:00 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 25 Jan 2012 17:00:52 +0000 (09:00 -0800)
commitfe63ab1109c2cc69b2050eb5c31642af6b9de066
tree8d69903715cdd5ccb3554cde0db21f68c9cf7703
parent468531a04023be777913f7c51f683d2a1833f7e8
parent9c7d56a78ba819fdc8046ab87c82ee2b57d200b5
am 9c7d56a7: am dd347d51: (-s ours) am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1

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