OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c6e09ee
0d6753d
)
Merge "Always cancel clock animation" into pi-dev am: a1cb973366
author
Lucas Dupin
<dupin@google.com>
Wed, 6 Jun 2018 22:33:25 +0000
(15:33 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 6 Jun 2018 22:33:25 +0000
(15:33 -0700)
am:
0d6753d1ed
Change-Id: I855e9dcc604514322b2f817f03759ca2b6593fe8
1
2
packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
patch
|
diff1
|
diff2
|
blob
|
history
packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
Simple merge
diff --cc
packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java
Simple merge