tree 9f165c3fd1b1cf36f766a69c7806179b7f1fb307
parent 8f84f62d1f296f78dcf50b9b4c22adb738b4b82a
parent 8977c1dab572cb61ebff1f844a549f7fb2e4e590
author Yuncheol Heo <ycheo@google.com> 1416002143 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416002143 +0000

am 8977c1da: Merge "CEC: Fix a bug in HdmiPortInfo.createFromParcel()." into lmp-mr1-dev

* commit '8977c1dab572cb61ebff1f844a549f7fb2e4e590':
  CEC: Fix a bug in HdmiPortInfo.createFromParcel().