Merge "Add parameter for accessing channels from 3rd-party TV apps." into oc-dev
am: fd09753145

Change-Id: I57383029a36e03d4b014ea7587443705d6bacb96
tree: 03d3e30904c704966a40c2db7003352020e899a5
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml