tree cd8cdb6c37fbe5492789ee6555b1b3e63f388613
parent 8ccaedb51b0734d2711b8bf86f6ffeb57a5da172
parent f2fe3505dac16dfa990fbab56713abab6ba0bc54
author Jinsuk Kim <jinsukkim@google.com> 1396491100 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396491100 +0000

am f2fe3505: am 31518f74: Merge "Use build property for CEC device OSD name" into klp-modular-dev

* commit 'f2fe3505dac16dfa990fbab56713abab6ba0bc54':
  Use build property for CEC device OSD name