tree de2d547ffa64831ec7694279db9b49515f2f0800
parent 0f851e71bd8b4dd3427375238d22563b74066b2f
parent 7f2984fcd44ee08b10a27353c137ef019e3bc0e5
author Daniel Xie <dxie@google.com> 1437100245 +0000
committer android-build-merger <android-build-merger@google.com> 1437100245 +0000

Merge "TIF: use \'TV app\' instead of \'Live Channels\'" into lollipop-cts-dev
automerge: 7f2984f

* commit '7f2984fcd44ee08b10a27353c137ef019e3bc0e5':
  TIF: use 'TV app' instead of 'Live Channels'