tree 0c1e79e181ec4b6176911ee87f0484b23ab18c37
parent 94f8d4407118f78ee968e966caea931fcf08b97c
parent c95297654f7987d6ca434d6105d72b48b8793345
author Diego Perez <diegoperez@google.com> 1490794549 +0000
committer android-build-merger <android-build-merger@google.com> 1490794549 +0000

Merge "Add audio service support to BridgeContext" into oc-dev am: 92b3242827
am: c95297654f

Change-Id: Ic9359116c9746565fdecf8b542b22647ea1044b8