tree e868b46901e1f8dd68c4c9f570482e8c93e2bba3
parent 2ffc58f332bfd56bf8814ccc3a2a9d34d5f24473
parent a0465afe8de773acd371c8ebb91e92735191631d
author Mario Bertschler <bmario@google.com> 1501100671 +0000
committer Mario Bertschler <bmario@google.com> 1501100671 +0000

[automerger] Merging ScrimView into GradientView am: a0465afe8d

Change-Id: Idb42428806ae6c26326cb98071bc2ecb5585e025