tree 6d2077db34c73a5953e4cf223cb4ed0a2d2129a9
parent c820ffa8207feadfc62e6ef61222a2478d5e1678
parent 96a424e261c55f08de8f1c6a3d5c7547030aafab
author Jae Seo <jaeseo@google.com> 1432222792 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432222792 +0000

am 96a424e2: am 184016aa: Merge "TIF: Build the list of available TV inputs as the current user" into mnc-dev

* commit '96a424e261c55f08de8f1c6a3d5c7547030aafab':
  TIF: Build the list of available TV inputs as the current user