tree 8c575fdab35be7095b69e43beca74a4f090e68e0
parent 621a7ef452c9ab930c239f60a03eea2f28d9958a
parent 4796cf6b436ac60fa1a49514d9020209140e6a00
author Julia Reynolds <juliacr@google.com> 1503012057 +0000
committer android-build-merger <android-build-merger@google.com> 1503012057 +0000

Merge "Let the foreground service channel be blocked" into oc-dr1-dev am: 6614a2e5d0
am: 4796cf6b43

Change-Id: I9b654b4d2e01785a9bc19e985062395073718e7f