Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev am: 2c2b6b48de am: 13d1167e44
am: 23a16c2ae4
Change-Id: Ib205cc84febc20555853414e4d0b6cc0ad17c7ff
This commit is contained in: