From: Lucas Dupin <dupin@google.com>
Date: Tue, 20 Mar 2018 18:16:02 +0000 (+0000)
Subject: Merge changes I09f58bdc,Iaf6cee33 into pi-dev
X-Git-Tag: android-x86-9.0-r1~168^2~60
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b5438ce1059d69b2ebd5be427fcadc60e1fdce7c;p=android-x86%2Fframeworks-base.git

Merge changes I09f58bdc,Iaf6cee33 into pi-dev

* changes:
  Hide SHOW_WHEN_LOCKED activity under scrim
  Temporarily show wallpaper when pulsing
---

b5438ce1059d69b2ebd5be427fcadc60e1fdce7c