tree 37890006740a8b39d8d4268814a1832eae8e1dbb
parent 4d9c94d54199fd658e0f8a50e391f9cd32762519
parent fd3e10b1bcbf4fdd6f5bdcb2df67c8436401058a
author Tyler Gunn <tgunn@google.com> 1528327999 -0700
committer android-build-merger <android-build-merger@google.com> 1528327999 -0700

Merge "Ensure self-managed calls use voip audio mode." am: b62aa315d1
am: fd3e10b1bc

Change-Id: I8f7842fa84fcce91a292b32189cd827b4a125fb0