tree aa3d8ed7f3446a79f32b9df51cedefa1eb752fe0
parent a7ec5f1067d640be206bf597a67c64750b8a1fef
parent 47f52f247d6d895878b831de448f19b98225515d
author Eric Laurent <elaurent@google.com> 1417003310 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417003310 +0000

am 47f52f24: audio: new stream types

* commit '47f52f247d6d895878b831de448f19b98225515d':
  audio: new stream types