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:
e1612d0
e90d58e
)
Merge "AOD: Fix wakeAndUnlockPulsing transition" into oc-dev am: 838e365581
author
Adrian Roos
<roosa@google.com>
Wed, 24 May 2017 22:18:43 +0000
(22:18 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 24 May 2017 22:18:43 +0000
(22:18 +0000)
am:
e90d58ed09
Change-Id: I93ab6feaf0b4fd36fa80fdc48878a5c71df70e26
1
2
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
patch
|
diff1
|
diff2
|
blob
|
history
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
patch
|
diff1
|
diff2
|
blob
|
history
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
Simple merge
diff --cc
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
Simple merge
diff --cc
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
Simple merge
OSDN Git Service
