tree d1d7d277482ed3e6c191cf6c153850b23e5c48fc
parent 4dc79faefb2f38b08761efdb01f2a0668426288b
parent f32310a7e6589a26c4b7fbb45d935a80f13f27d9
author Peiyong Lin <lpy@google.com> 1529702002 -0700
committer android-build-merger <android-build-merger@google.com> 1529702002 -0700

Merge "Rename Automatic color to Adaptive color" into pi-dev
am: f32310a7e6

Change-Id: I58c8322796905bc7ed589c3153c9de65598f268f