tree 6b73b50d39ea0317cf5b2866f7492a2290ada6e2
parent 6d4af736d09fcc7165d3e36bc86b7292d76ad1a4
parent 5a484b753cc72d6a50c1dd3bbf68b3403c741a3a
author Eric Laurent <elaurent@google.com> 1351546325 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351546325 -0700

am 5a484b75: audio policy: active analog dock force usage

* commit '5a484b753cc72d6a50c1dd3bbf68b3403c741a3a':
  audio policy: active analog dock force usage