tree c603ceadc08c2258d12a286811a63836a80140af
parent a7af3852081a883ab9323407db47902edcf704b0
parent e0b25746267972b370a1c773ad18d146ee8163c3
author Julia Reynolds <juliacr@google.com> 1494536123 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1494536128 +0000

Merge "Lock relevant fields on channel update" into oc-dev