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:
73048b0
382b2d6
)
Merge "Follow supportlib changes in SliceManager" into pi-dev am: 96910a6dc2
author
Jason Monk
<jmonk@google.com>
Fri, 25 May 2018 06:45:33 +0000
(23:45 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 25 May 2018 06:45:33 +0000
(23:45 -0700)
am:
382b2d612c
Change-Id: I0a49a82ac3757f4840ef10b448e9df8cb8548a9c
1
2
packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
Simple merge