tree a7c85a27fd256f982e228dde23fef5c2004d8bd6
parent bad572d613eb848bea3a4fe3dadfeb847b5bc642
parent 933653daaa49090f88a9109611f3d59dcc9c8ca8
author Glenn Kasten <gkasten@google.com> 1368483259 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368483259 -0700

am 933653da: am cb4cdd0f: am 143e7260: am dbffc2b1: Add audio terminology

* commit '933653daaa49090f88a9109611f3d59dcc9c8ca8':
  Add audio terminology