tree a80fe153bf12113484de9193a500bc6dac1c3d2d
parent 18d2d51ee30d8df4d3afa5e7b6bb7e7171a18b63
parent 294297df4e3f327a81d922563c518aee8ee3e51d
author Jinsuk Kim <jinsukkim@google.com> 1412952333 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412952333 +0000

am 294297df: Merge "CEC: Prevents HdmiControlService from turning on TV on wakeup" into lmp-dev

* commit '294297df4e3f327a81d922563c518aee8ee3e51d':
  CEC: Prevents HdmiControlService from turning on TV on wakeup