OSDN Git Service

am 5d76def6: am feb1d988: (-s ours) am fee5a860: Merge "DO NOT MERGE Revert "AudioFli...
authorJustin Ho <justinho@google.com>
Mon, 23 Jan 2012 23:18:41 +0000 (15:18 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 23 Jan 2012 23:18:41 +0000 (15:18 -0800)
commit8e5a25d101f96b05a05d698c554b09b57cda8c0f
treef51ab2224dac6fd980a461c51fef2e9c0ca10333
parent3f718682742292833d97502666b9a979fe24d2cb
parentd2ef8db2040885e8d2a23d7fb478013c5050685b
am 5d76def6: am feb1d988: (-s ours) am fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1

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