tree ffb29870bb558b27cac0b6f1e477f004036373cc
parent bb19b792cf51934fd5f4fe989e66255cc8e132a4
parent fba679414372bb16e377a2b04ff609e374e67d5e
author Eric Laurent <elaurent@google.com> 1444947535 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444947535 +0000

am fba67941: am 0eb5a270: Merge "audio policy: fix transition from VoIP to voice call on USB" into mnc-dr-dev

* commit 'fba679414372bb16e377a2b04ff609e374e67d5e':
  audio policy: fix transition from VoIP to voice call on USB