tree b15b74f25000d8794cd2860b8d12f9e121008ae1
parent bf2e28b7d8515e34a5c97958910a4869e15136c5
parent 2fb1356be6c339f14cc60c6449012d8f77ea919f
author Sunny Goyal <sunnygoyal@google.com> 1472166272 +0000
committer android-build-merger <android-build-merger@google.com> 1472166272 +0000

Merge "Moving the scrim to draglayer" into ub-launcher3-calgary-polish
am: 2fb1356be6

Change-Id: Icd9de3ac14653823a44f052fb2fc361a7eb79c56