tree bd7a4e3fe5baecafe6706e7d848297711d7b823a
parent dbc26a867d0a90319b0b016f9d658d9e754d6cb2
parent 56af4f212a21fe08b54de10322e023b09fa125aa
author Eric Laurent <elaurent@google.com> 1366386162 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366386162 -0700

am 56af4f21: Merge "AudioService: SCO audio backward compatibility" into jb-mr2-dev

* commit '56af4f212a21fe08b54de10322e023b09fa125aa':
  AudioService: SCO audio backward compatibility