OSDN Git Service

Merge "Fix number of channels in inline notification settings" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Mon, 15 May 2017 14:18:17 +0000 (14:18 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 15 May 2017 14:18:22 +0000 (14:18 +0000)

Trivial merge