tree 20b42224138b7c71d82612c3473e70ad0b9ecddd
parent 09ef42ab63dc36d1097390bda6bf08d1cf5332e1
parent a916e260db1e6c2c20fe0451ffe380f5e19af818
author Terry Heo <terryheo@google.com> 1405303011 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405303011 +0000

am a916e260: Merge "audio: add definition for new audio loopback input device"

* commit 'a916e260db1e6c2c20fe0451ffe380f5e19af818':
  audio: add definition for new audio loopback input device