tree f4e35c1278dfd916c737ef26262d181acdfeff0f
parent 4b26b7fb4604ded2ec4e2bb3e4f40a76c48c6fcf
author chaviw <chaviw@google.com> 1637253453 -0600
committer chaviw <chaviw@google.com> 1637253453 -0600

Merge color property in a transaction

The LayerState.merge code didn't have colors getting merged

Test: Builds
Fixes: 206341593
Change-Id: Ic2721242c772099802f635f8019cb3b7a24d6c90