tree 84a2ef6e5ce1126931d3e4a1127d254b4c5a5f64
parent ab8c640c6e8fcd8051bb2f1eb8c9ff5123100246
parent 408d0b67c6e384052fd114fbe969a558f990d7a1
author Eric Laurent <elaurent@google.com> 1455839867 +0000
committer android-build-merger <android-build-merger@google.com> 1455839867 +0000

Merge "DO NOT MERGE - audio policy: disable concurrent capture" into nyc-dev
am: 408d0b67c6

* commit '408d0b67c6e384052fd114fbe969a558f990d7a1':
  DO NOT MERGE - audio policy: disable concurrent capture