tree e8f49c200e061ef19c824862ec2d1a5687f5839d
parent 659e804108ed80d88213f9c1b74bf1a1b4354c93
parent 7a21c4cdb172f6353cd4166e80910893dc981196
author Matthew Xie <mattx@google.com> 1366950416 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366950416 -0700

am 7a21c4cd: am 7f3c5d16: Merge "Added flush() for bluetooth output stream" into jb-mr2-dev

* commit '7a21c4cdb172f6353cd4166e80910893dc981196':
  Added flush() for bluetooth output stream