From: Alison Cichowlas <asc@google.com>
Date: Mon, 19 Jun 2017 15:15:31 +0000 (+0000)
Subject: Merge "Notification settings update." into oc-dr1-dev am: cd9224a058
X-Git-Tag: android-x86-9.0-r1~756
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1a74eefb5475c49732169787bfed4be5c25588d1;p=android-x86%2Fpackages-apps-Settings.git

Merge "Notification settings update." into oc-dr1-dev am: cd9224a058
am: eeda4ae540

Change-Id: I3139992a754e69e8ef1e2da858403a0e3b3f3b79
---

1a74eefb5475c49732169787bfed4be5c25588d1