From: Amit Pawar <amitpawar@google.com>
Date: Mon, 12 Jun 2017 20:09:07 +0000 (+0000)
Subject: Merge "Fix wake-and-unlock animation" into oc-dev
X-Git-Tag: android-x86-9.0-r1~1029^2^2~399
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=963fed0345c5;p=android-x86%2Fframeworks-base.git

Merge "Fix wake-and-unlock animation" into oc-dev
am: 8f1d13300f

Change-Id: Ib0876be70423fa3218ffb3172f3a177c45f98681
---

963fed0345c5bddbb15a6fd99fdee14e3765f8d1