tree 7342313e9d4f6f771c4707e9684f195b6da78a84
parent 2419dc0bfa500927468bcd2914af5ddbcc083e80
parent 1b91d68c517a00765fbd0ed747fe3d4e51820680
author Clay Murphy <claym@google.com> 1424461502 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424461502 +0000

am 1b91d68c: Merge "Update audio terminology"

* commit '1b91d68c517a00765fbd0ed747fe3d4e51820680':
  Update audio terminology