tree 78be7fa3d9855c2a536e80ed4e7360845a968791
parent d41a61df805dbe31c4f46cf12b2c7ae4f752987a
parent 1bc876bb5b2b8506fe5e47421456c36ba4eefdea
author Jay Patel <pateljay@google.com> 1567619596 -0700
committer android-build-merger <android-build-merger@google.com> 1567619596 -0700

Merge "Set SAM To Disabled On HdmiControl Disabled"
am: 1bc876bb5b

Change-Id: If9d1bda003ca03f6579559b7d13acbadba486dcd