OSDN Git Service

Merge "Do not run peek animation when keyguard is fading" into pi-dev
authorLucas Dupin <dupin@google.com>
Tue, 3 Apr 2018 17:18:26 +0000 (10:18 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 3 Apr 2018 17:18:26 +0000 (10:18 -0700)
am: 3e57c9f525

Change-Id: I90543988ee3465c30c79a1f90f238979cc009b8b


Trivial merge