OSDN Git Service

Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev am: 2c2b6b48de
authorqqzhou <qqzhou@codeaurora.org>
Wed, 9 Aug 2017 23:04:07 +0000 (23:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Aug 2017 23:04:07 +0000 (23:04 +0000)
am: 467aad4219

Change-Id: I8084bdf06e20e94a2963f5bfe590a7588a9c2e4c


Trivial merge