tree 6a3a9bc75d29236709e88e2bc5f61420e8fd7170
parent f537259ec420052cae342c213579aec26c488055
parent cc15afbe12a92e1b0db7c2f8e97c5c0c9b089f16
author Ji-Hwan Lee <jihwan@google.com> 1402006991 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402006991 +0000

am b3412adf: Merge "TvContract: Add channel logo and program thumbnail" into lmp-preview-dev

* commit 'b3412adf92b9d932b600acf44c4463cf06387a8e':
  TvContract: Add channel logo and program thumbnail