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

* commit '376dee63f383d31f547a09d9708103592d9e0dd9':
  CEC: Fix a bug in HdmiPortInfo.createFromParcel().

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base