tree 1980cce07b6e49827c40dd4b1fbddb691f6ed17b
parent e0360d0e86fed644e6cbe406de66d77d7ae9e697
parent cba7fe5f1cb13108367d6de288428801b2d89a8e
author Eric Laurent <elaurent@google.com> 1422653293 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422653293 +0000

am cba7fe5f: am 6f4428de: am d99c6855: Merge "audio policy: match attached device to declared devices" into lmp-mr1-dev

* commit 'cba7fe5f1cb13108367d6de288428801b2d89a8e':
  audio policy: match attached device to declared devices