tree 8ba3344f5e3cc12e57c18ec9ab87d279af3bb9fa
parent 6230cdf5721f11660e2c0fec1c5695346a9001d0
parent ff636d383c8f0464e543866ae73ec4a367efd15a
author Yuncheol Heo <ycheo@google.com> 1415253211 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415253211 +0000

am ff636d38: Merge "CEC: Don\'t send <Feature Abort> on the short message" into lmp-mr1-dev

* commit 'ff636d383c8f0464e543866ae73ec4a367efd15a':
  CEC: Don't send <Feature Abort> on the short message