tree ad9e1270321e71a1c0578a15b7a9efc8f42432ad
parent fd05e9a0750e9658989f49fbf51fd1fefbe466b3
parent 19aa8ae955b3d923747d9f2edb8536ef5d948bb3
author Chia-I Wu <olv@google.com> 1508906309 +0000
committer android-build-merger <android-build-merger@google.com> 1508906309 +0000

Merge "Add color mode setting" into oc-mr1-dev
am: 19aa8ae955

Change-Id: I99821d20c99ae46537640cde4418c9079a46f6f1