tree d31e2adc1f9cce4f27ca07d30bee921032e33a3c
parent ee027a576ddebaf1ae739219be01b0240b15f80c
author Nick Chalko <nchalko@google.com> 1507050997 -0700
committer Nick Chalko <nchalko@google.com> 1507124893 +0000

Sync to match Live Channels 1.15(ncis)

aka ub-tv-dev at a73a150bb7d0d1ce867ef980c6ac8411899d40ad

Bug: 64021596
Change-Id: I7c544fd15e2c58784f8babc31877ad0dfeebb4c0
(cherry picked from commit 633eb826b8c97731dfc5ef12c7bf78a63734275d)