From: Doris Ling <dling@google.com>
Date: Sat, 24 Sep 2016 00:35:32 +0000 (+0000)
Subject: Merge "Split Ambient Display settings." into nyc-mr1-dev am: 4f8a703d51 am: f79a9b397e
X-Git-Tag: android-x86-8.1-r1~1635
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=48b126be5c3dc2649a87eed93025ecf640763f0e;p=android-x86%2Fpackages-apps-Settings.git

Merge "Split Ambient Display settings." into nyc-mr1-dev am: 4f8a703d51 am: f79a9b397e
am: 799388df91

Change-Id: I3368cd81b3c7badf2b1acf5eb0b293c1412b8687
---

48b126be5c3dc2649a87eed93025ecf640763f0e