tree 0da880bafab9c8c6110f05f67bae7dc2057ddbad
parent 6767e7565a165a99a28d50b407b1f19726cbe64c
parent 691b715e770e905f27ae32cda79a0e6e7351c25e
author Justin Klaassen <justinklaassen@google.com> 1504651148 +0000
committer android-build-merger <android-build-merger@google.com> 1504651148 +0000

Merge "Fix A2dpProfileTest#getLabelDeviceConnectedWithHighQualityCodec" into oc-mr1-dev am: ae1dd84bf0
am: 691b715e77

Change-Id: Id187f844dd22b47db7cbc0f62ba07e3b78100986