tree 01b2917f6d89fba4e3048d51d436e1225ec57fda
parent 8a1702ce28ecaf600cb789292c42f6ba6bbc113f
parent 6072ad04129ba0163c441c2f00e7d5a98e1ec30c
author Mario Bertschler <bmario@google.com> 1501104991 +0000
committer Mario Bertschler <bmario@google.com> 1501104991 +0000

[automerger] Merging ScrimView into GradientView skipped: 254bd42729 am: 6072ad0412

Change-Id: I61d2cbd6d9a51748de5fad7f468cb72b3fc57164