tree d867b794bbbd7920f9e968b363adbcd4f1f84a7e
parent 0a22d43c9143475c889ce54f0de6261e8857ab9d
parent 43b2746bcdfb49aed255ac0f6dd6fb95909dcfc1
author Jinsuk Kim <jinsukkim@google.com> 1422513999 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422513999 +0000

am 43b2746b: Merge "CEC: Let <Active Source> from the active source work" into lmp-mr1-dev

* commit '43b2746bcdfb49aed255ac0f6dd6fb95909dcfc1':
  CEC: Let <Active Source> from the active source work