[automerger skipped] RESTRICT AUTOMERGE Use HdmiProperties class for all...
[automerger skipped] RESTRICT AUTOMERGE Use HdmiProperties class for all properties that start with ro.hdmi am: 36b8f991 am: 12c27fc9 -s ours am: a275ab8a
Change-Id: If7cca885fa315596be44fb6e4fc28fa394a4281a