tree 4c4528ce80117a16cb9dac9043e852aa521d4259
parent 7db0f380f73940fdedae13269a3ff7e070d73bf8
parent 8604f36208a3c7240f0bcc89ed50f10013c1b427
author Mario Bertschler <bmario@google.com> 1501105168 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501105168 +0000

Merge changes from topic 'am-fdbc4fab-6283-4635-be1f-75b7a999e4d6' into ub-launcher3-master

* changes:
  [automerger] Merging ScrimView into GradientView am: a0465afe8d
  Merging ScrimView into GradientView