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