OSDN Git Service

am e988e0c3: Merge "resolved conflicts for merge of 05683c85 to master"
authorEric Laurent <elaurent@google.com>
Thu, 19 Jan 2012 18:54:03 +0000 (10:54 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 19 Jan 2012 18:54:03 +0000 (10:54 -0800)
commita38ca6981046b0dc7753d9132c4d54021987bcba
treef51ab2224dac6fd980a461c51fef2e9c0ca10333
parent7b60f7eaeae3b2b9c14c2a313fe3b05daf460e85
parent67398176f1da61626eff50493726da978b2a7476
am e988e0c3: Merge "resolved conflicts for merge of 05683c85 to master"

* commit 'e988e0c31ca16160dee1b7c689ac31cd70fe43a2':
  AudioFlinger: mix track only when really ready (2)