tree 0f3f9ac7bff9168a7091aa98daca6985edcbb400
parent 3bd33d916de77233d01b6ffb3f5cec17a3a23ea2
parent 5341e489d4d8c32e5da21ecd01f215423aa06bae
author Yorke Lee <yorkelee@google.com> 1431616178 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431616178 +0000

am bb4c573f: Merge "Rename AudioState to CallAudioState" into mnc-dev

* commit 'bb4c573f102d86d79ed943d21e0a8d28d3ea0f84':
  Rename AudioState to CallAudioState