OSDN Git Service

Merge "Fix number of channels in inline notification settings" into oc-dev
authorGeoffrey Pitsch <gpitsch@google.com>
Mon, 15 May 2017 14:24:25 +0000 (14:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 15 May 2017 14:24:25 +0000 (14:24 +0000)
am: 1ab1da3f25

Change-Id: Iae226f9da2ff9f4ee63945c41d6f9ad1685d8286


Trivial merge