tree cefff690248bc9a13ac6eddb583883beab1214da
parent 796c5fc6abf01b1864223156d578288657fe9923
parent 0fabf2e81559106cb4aaf9e8ba45b0bed37d5eb8
author Jean-Michel Trivi <jmtrivi@google.com> 1271800095 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1271800095 -0700

am 0fabf2e8: 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 '0fabf2e81559106cb4aaf9e8ba45b0bed37d5eb8' into kraken

* commit '0fabf2e81559106cb4aaf9e8ba45b0bed37d5eb8':
  Fix bug 2604132 40s skip after undocking