Merge "Notification settings update." into oc-dev am: e5493808fd
am: 7cdc518674
-s ours
Change-Id: Ia4b989c4b3459d7ea1b76fa167f034844fc8159a
This commit is contained in:
e5493808fd
am: 7cdc518674
-s ours
Change-Id: Ia4b989c4b3459d7ea1b76fa167f034844fc8159a