Merge "Add color mode setting am: af5e11245d -s ours am: 9d8c5f626a -s ours am: 064b064809 -s ours"

This commit is contained in:
Android Build Merger (Role)
2017-10-27 00:47:58 +00:00
committed by Android (Google) Code Review

Diff Content Not Available