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:
304c3b3
e986196
)
Merge "AOD animation polish" into pi-dev am: 704a0d6174
author
Lucas Dupin
<dupin@google.com>
Fri, 29 Jun 2018 18:47:32 +0000
(11:47 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 29 Jun 2018 18:47:32 +0000
(11:47 -0700)
am:
e9861964bf
Change-Id: I135ff3a852d2b1d2288add1c0c94bbf7313d1aec
1
2
packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java
Simple merge