tree e1c46512a1f64cb7c15299f31e6e4303e0b53566
parent eed63916a184b05fa8572c9a8151745d05777740
parent 08fe9fbf56e8954ee4817c7ae69b1e6b059a864f
author Dongwon Kang <dwkang@google.com> 1414116367 +0000
committer android-build-merger <android-build-merger@google.com> 1414116367 +0000

Merge "TIF: exclude tuner TV input not having a setup activity in the input list." into lmp-mr1-dev automerge: f9f7acf
automerge: 08fe9fb

* commit '08fe9fbf56e8954ee4817c7ae69b1e6b059a864f':
  TIF: exclude tuner TV input not having a setup activity in the input list.