tree 1a028537f282b8640a6bf4fbc02f3a275af5b05a
parent b5dafb6c10ff8443bc334a95b61642243a7a8923
parent 526185c89bd07c1de33ca2fd6dad6a972fa1609d
author Julia Reynolds <juliacr@google.com> 1492528287 +0000
committer android-build-merger <android-build-merger@google.com> 1492528287 +0000

Merge "Channel settings updates" into oc-dev
am: 526185c89b

Change-Id: Ibb9cb726d26579ce94f26e18d00bcca73061b9e6