[automerger skipped] Merge "DO NOT MERGE Fix color_lint errors" am: fcaf926dc1 -s ours

am: 6e65a32468  -s ours

Change-Id: Iaf37f20f3ff607c46a66eb278dc17d6998f87984
This commit is contained in:
Fan Zhang
2018-08-28 12:14:58 -07:00
committed by android-build-merger

Diff Content Not Available