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)
commit166a994a4cceca86eb857e2bed2985faca45bda3
treedc7261dd1c4084a98e81aed046947d691cfcea63
parent7f550afc37e353149ce58b8519d80c0f5f3067df
parent540e8f50e34f52876f94eafd9c3a1b58924e9b25
Merge "Allow some system channels to be blocked" into oc-dev
am: 540e8f50e3

Change-Id: Ic3c932d5307992a3937eea568ac3a7cd493ca8a4