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:
fd5c4dd
6e8d709
)
Merge "Check for keyguard occlusion on camera lift" into oc-dr1-dev
author
Jonathan Solnit
<jsolnit@google.com>
Tue, 20 Jun 2017 16:24:23 +0000
(16:24 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 20 Jun 2017 16:24:28 +0000
(16:24 +0000)
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