[automerger skipped] Merge "DO NOT MERGE Fix color_lint errors"

am: fcaf926dc1  -s ours

Change-Id: I4d66ba0b4164b5b700c7671f5d249c30ad38722e
This commit is contained in:
Fan Zhang
2018-08-28 11:38:27 -07:00
committed by android-build-merger

Diff Content Not Available