Commits
Jinsuk Kim authored and Android Git Automerger committed f12d2082a50M
am b25c225c: am 0878e8c9: am 62ba538b: resolved conflicts for merge of 3170c035 to lmp-mr1-dev * commit 'b25c225c28b527c04635d7d1aa91b06b4d74c2c8': CEC: Prevents HdmiControlService from turning on TV on wakeup
Showing diff tocb5f5689fb8