From: Peiyong Lin <lpy@google.com>
Date: Fri, 22 Jun 2018 21:08:37 +0000 (+0000)
Subject: Merge "Rename Automatic color to Adaptive color" into pi-dev
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f32310a7e6;p=android-x86%2Fpackages-apps-Settings.git

Merge "Rename Automatic color to Adaptive color" into pi-dev
---

f32310a7e6589a26c4b7fbb45d935a80f13f27d9