tree fc39960b7e6d7245bb1808085222ee911495e2f3
parent 3f5d7b83ee194db39c5f784146e4abc4f6568854
parent 8ccbd4ba6d7f1180284df7aa5735dba48b10d8ee
author Jean-Michel Trivi <jmtrivi@google.com> 1271799906 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1271799906 -0700

am 8ccbd4ba: Merge "Fix bug 2604132 40s skip after undocking In case of A2DP write errors, there is an overflow in the calculation of the sleep duration to simulate the timing of a successful write." into froyo

Merge commit '8ccbd4ba6d7f1180284df7aa5735dba48b10d8ee' into froyo-plus-aosp

* commit '8ccbd4ba6d7f1180284df7aa5735dba48b10d8ee':
  Fix bug 2604132 40s skip after undocking