tree a7c85a27fd256f982e228dde23fef5c2004d8bd6
parent fdc0fb1d9cf53aa52e49bedd7a9ed0a5c7f3612b
parent 419e15e301175d83f80523301d5804f71e53894c
author Glenn Kasten <gkasten@google.com> 1368462790 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368462790 -0700

am 419e15e3: am 361b25c2: am f5799f54: am 94722b68: Merge "Audio edits." into jb-mr1.1-docs

* commit '419e15e301175d83f80523301d5804f71e53894c':
  Audio edits.