tree 1c4fbb93e3755448f56b21a8b435f29150c66c6e
parent 2ceefbf767d4eb338804545b2ca4300051197784
parent c86a5dbee4a4b9da021d07ef385b9f279b86039f
author Evan Laird <evanlaird@google.com> 1498600078 +0000
committer android-build-merger <android-build-merger@google.com> 1498600078 +0000

Merge "Set bolt and plus colors together" into oc-dr1-dev
am: c86a5dbee4

Change-Id: I16ac7e9a14a00573beef6db44390720b3bf5530d