tree bcc9944cad769296d6d1e7f1929cc813c29eaba3
parent e40f8ffe517474aef31626097365547467b2f3c8
parent 5e29d67d7c0d81ddea8a8de134bae226abedb1e1
author Brad Fitzpatrick <bradfitz@android.com> 1301940183 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301940183 -0700

am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket"

* commit '9907d161584415c81de1099678f160da172fd1a6':
  Fix data corruption when writing to Bluetooth socket