tree 9b1d87e587217104f50e322aae46c509dbfa6bcb
parent dc286f30f8aad4a537ce40b419a3dbc3e040bd24
parent 254bd42729e404d13a779b73b2f5dd67fa21e7da
author Mario Bertschler <bmario@google.com> 1501104989 +0000
committer Mario Bertschler <bmario@google.com> 1501104989 +0000

[automerger] Merging ScrimView into GradientView skipped: 254bd42729

Change-Id: Ie43c5a38060ae31862b1716d411c0edeccda7a92