tree ffc491f33636ef0d51d316c7aeaf99d8c869f125
parent 3c07b53978a3f3cf82c752cb9fa6c7e25d9cec41
parent 9e7616ffb1124ae2534ace7dabd09916240d63cf
author Daniel Xie <dxie@google.com> 1452569543 +0000
committer android-build-merger <android-build-merger@google.com> 1452569543 +0000

Merge "CTS fix: HifiUltrasoundSpeakerTestActivity is available with a speaker" into marshmallow-cts-dev am: 0cbbf64216 am: e0f81ff2a8
am: 9e7616ffb1

* commit '9e7616ffb1124ae2534ace7dabd09916240d63cf':
  CTS fix: HifiUltrasoundSpeakerTestActivity is available with a speaker