tree 1b89edd95f2d65ced9173f9b95849aeb55a69922
parent 85e6ff9b7724226ad0fc237e47cf3e589db68f29
parent 7970f36605af88aa480e21513f1a6585604063c5
author Jay Patel <pateljay@google.com> 1567624916 -0700
committer android-build-merger <android-build-merger@google.com> 1567624916 -0700

Merge "Set SAM To Disabled On HdmiControl Disabled" am: 1bc876bb5b am: 9e89d13906 am: 00ce169055 am: f465d5a2bd
am: 7970f36605

Change-Id: I4cfbb9a98b23ceddc327696b441288e631624f45