OSDN Git Service

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

Change-Id: I1bc8281004fdbd6735930cc8e3b3059fb778fd01


Trivial merge