OSDN Git Service

Merge "Avoid clock and challenge overlap" into pi-dev
authorLucas Dupin <dupin@google.com>
Thu, 29 Mar 2018 20:18:32 +0000 (20:18 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 29 Mar 2018 20:18:32 +0000 (20:18 +0000)
commit223c864b65bf73d4e464204912e0771f37339342
tree239263b9053fdb31f3930a2d6898664f5b321d68
parent4565da3da7b13afd40e52a25582377f1a68ef08e
parent4c2aa390125dc699f020155c9f65ed1a796ac7af
Merge "Avoid clock and challenge overlap" into pi-dev
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java