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:
03515d0
bc3c1d0
)
Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev
author
Adrian Roos
<roosa@google.com>
Thu, 3 Aug 2017 15:01:04 +0000
(15:01 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 3 Aug 2017 15:01:04 +0000
(15:01 +0000)
am:
bc3c1d0170
Change-Id: I598d82fcd14702151a924dd481fa067613c76b0e
1
2
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
Simple merge