tree b1d9e93e543541e81e9f4da31e19548fb55ca905
parent 0374973a74db0f1e83d763843acea08e685ad6d7
parent d80b81ff83d989dd5b0b19ebc29f0c3adc09f573
author Julia Reynolds <juliacr@google.com> 1503012778 +0000
committer android-build-merger <android-build-merger@google.com> 1503012778 +0000

Merge "Merge "Let the foreground service channel be blocked" into oc-dr1-dev am: 6614a2e5d0" into oc-dr1-dev-plus-aosp
am: d80b81ff83

Change-Id: I05152c40422c7efa0b8a5aa3bbed2f54f07cb04a