OSDN Git Service

Merge "Allow some system channels to be blocked" into oc-dev
authorJulia Reynolds <juliacr@google.com>
Fri, 26 May 2017 14:54:11 +0000 (14:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 May 2017 14:54:11 +0000 (14:54 +0000)
am: 540e8f50e3

Change-Id: Ic3c932d5307992a3937eea568ac3a7cd493ca8a4


Trivial merge