tree 4b490b8dac087a419069606b4735bd7c8607a3b6
parent b53e96fa6ab53ccb18815eb28e88c570a3d67ca3
parent 9e00b3c503df011bbd86cc86e8349cf4b35070d7
author Jon Miranda <jonmiranda@google.com> 1494535640 +0000
committer android-build-merger <android-build-merger@google.com> 1494535640 +0000

Merge "Fade in background scrim when resuming from screen off." into ub-launcher3-dorval-polish
am: 9e00b3c503

Change-Id: I8fe3eb9552bc7d59bdf3ecea1415e75fdfce6a69