tree 0b469effa5bbecba6a9962ae27903a9d9b277c4b
parent 6e0dcd64093c6c104576859de3eb75609528e808
parent 1fbb83b665720f2629d7a3759a0a7b61b4f04571
author Eric Laurent <elaurent@google.com> 1347322018 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347322018 -0700

am 1fbb83b6: am 85396642: Merge "audioflinger: changes for new audio devices enums" into jb-mr1-dev

* commit '1fbb83b665720f2629d7a3759a0a7b61b4f04571':
  audioflinger: changes for new audio devices enums