From: Alison Cichowlas <asc@google.com>
Date: Tue, 18 Apr 2017 20:54:59 +0000 (+0000)
Subject: Merge "In apps with no channels, provide settings for misc channel in top level.... 
X-Git-Tag: android-x86-8.1-r1~236
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7622c300bd0f95deef08c04bbc913d2dc7dbca95;p=android-x86%2Fpackages-apps-Settings.git

Merge "In apps with no channels, provide settings for misc channel in top level." into oc-dev am: cf172040a9
am: 2d8a676b47

Change-Id: I25d7f8ad2a4acca731aa29b9a97bb64feb8e3a98
---

7622c300bd0f95deef08c04bbc913d2dc7dbca95