tree eb869144e16b4dc91cb6ee5581d59f116d7ab51f
parent dde390fcf59fc6993740d5b0f0cca4981fff391c
parent c750b06b27d22a70658ef681f86db0a202f8a832
author Simon Wilson <simonwilson@google.com> 1347995638 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347995638 -0700

am c750b06b: Merge "audio: add bluetooth sco support" into jb-mr1-dev

* commit 'c750b06b27d22a70658ef681f86db0a202f8a832':
  audio: add bluetooth sco support