tree 4972ab8765846562bb2811ca8e85b30dabfd8e46
parent b7a55a898f7581c74a362247345e71f24c798b72
parent a98bdea2c5793dbf4cde64137fa5f126ff4c229c
author Julia Reynolds <juliacr@google.com> 1495810948 +0000
committer android-build-merger <android-build-merger@google.com> 1495810948 +0000

Merge "Allow some system notifications to be blocked." into oc-dev am: 3a2ac3e11b
am: a98bdea2c5

Change-Id: Iec706994f0c7af34ba38b01fffaccdf6ee1bbe84