tree c5d985327b46fb4ae4e88b4f3f7f53e3bf91d4a4
parent 998d84a0d9ebf61f001232a2a3675bbaed7d0f50
parent 51c2848c449a322afc3977f4918a84b40b0a734e
author Chia-I Wu <olv@google.com> 1508907264 +0000
committer android-build-merger <android-build-merger@google.com> 1508907264 +0000

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

Change-Id: I97fb37429e97c59b223a36431f59c43c86c92ab0