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:
a3115fb
544e628
)
Merge "Fingerprint: Show bouncer when fingerprint is disallowed" into oc-dr1-dev
author
Adrian Roos
<roosa@google.com>
Tue, 25 Jul 2017 14:11:10 +0000
(14:11 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 25 Jul 2017 14:11:10 +0000
(14:11 +0000)
am:
544e628e16
Change-Id: I2df5b364bbfde27299d5f5114224dd6bfaeaa782
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