tree 7cb35f83aba8ba152785020b4271cfabb039ee02
parent 277fd75edbe693b8ac4d7da09baae75b246fe5da
parent 548e82e6e29389dbe2a82a6dc1d97fc8ca71df35
author Ritwika Mitra <ritwikam@google.com> 1560886009 -0700
committer android-build-merger <android-build-merger@google.com> 1560886009 -0700

Merge "Fix failing VendorServiceControllerTest caused by API change" into qt-dev
am: 548e82e6e2

Change-Id: I558080f673bca92d5ecfefcba3edcc874fcaa17b