OSDN Git Service

Merge "Allow some system channels to be blocked" into oc-dev
authorJulia Reynolds <juliacr@google.com>
Fri, 26 May 2017 14:39:26 +0000 (14:39 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 26 May 2017 14:39:31 +0000 (14:39 +0000)

Trivial merge