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)
commit540e8f50e34f52876f94eafd9c3a1b58924e9b25
tree6f2a43578742bc743448127b81bbb83b74e51e9b
parent136a3da4a37656306329109e1e235f66a0e16459
parent3a77e1d4a0b3395600d929a8f352e9c25a57ab72
Merge "Allow some system channels to be blocked" into oc-dev