tree 3e5f6cb1c58d91ea814260b248c9d97cbf935e02
parent f6e111221689bbba757ca1d80fb8b532352c64f4
parent 6e90e4ea4f816473d1941595d1b46b65ffed7bee
author Jae Seo <jaeseo@google.com> 1404333946 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1404325370 +0000

Merge "TvContract: Add a field for network affiliation to the Channels table"