tree cd2301d3a2a11af875e289a62a5391ca40565230
parent 355d731ece99b461bedab9dfe6113ccd3beb332b
parent a6d34ee8b4cbcda514274272188414f5ef107450
author Jae Seo <jaeseo@google.com> 1456425452 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1456425454 +0000

Merge "TIF: Define activity action to set up channel sources" into nyc-dev