OSDN Git Service

Merge "Always cancel clock animation" into pi-dev am: a1cb973366
authorLucas Dupin <dupin@google.com>
Wed, 6 Jun 2018 22:33:25 +0000 (15:33 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Jun 2018 22:33:25 +0000 (15:33 -0700)
commite1085828baa666599c8046721f275530a20ce7c4
treea7c6a0cccf71693ef8675343496be4eee7f29654
parentc6e09ee4191cc617a6c9e0eca9026b8deb5de7a1
parent0d6753d1ed8c44064d3110c910e2e0155621123e
Merge "Always cancel clock animation" into pi-dev am: a1cb973366
am: 0d6753d1ed

Change-Id: I855e9dcc604514322b2f817f03759ca2b6593fe8
packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java