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)
commit04f57e2d509434b20e6f350932a562c3f1108760
treeceaf0c579925bcf8e177867b0c42de6207891224
parent59817588f67780f0c2e652d0af91f73eefe3c0a8
parent1ab1da3f250d169bc5c21929d7d40868a21af0d8
Merge "Fix number of channels in inline notification settings" into oc-dev
am: 1ab1da3f25

Change-Id: Iae226f9da2ff9f4ee63945c41d6f9ad1685d8286