tree b603f6a16fd634a973a4ff5fa3ac0de765911655
parent fa9cc1acbd4e05079a9ecb6748a5c6a53f734d8a
parent b756707700b0f37d711344a9b937a407f2c2c088
author Eric Laurent <elaurent@google.com> 1440678047 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440678047 +0000

am b7567077: (-s ours) am 0627da9d: Merge "audio: fix audio_device_is_digital() function." into mnc-dev

* commit 'b756707700b0f37d711344a9b937a407f2c2c088':