tree 6b73b50d39ea0317cf5b2866f7492a2290ada6e2
parent 08139cedcdf37f92c2fe7d8e61be1f4b0f9da9a5
parent 92be42ebb9a62876a003b712ddd2968dde2d6476
author Eric Laurent <elaurent@google.com> 1351616100 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351616100 -0700

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

* commit '92be42ebb9a62876a003b712ddd2968dde2d6476':
  audio policy: active analog dock force usage