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:
68245c0
cd8f4f7
)
Merge "Disable lockscreen notifications for secure users on upgrade." into lmp-dev
author
Chris Wren
<cwren@android.com>
Fri, 29 Aug 2014 21:25:42 +0000
(21:25 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Fri, 29 Aug 2014 21:25:43 +0000
(21:25 +0000)
1
2
core/java/android/provider/Settings.java
patch
|
diff1
|
diff2
|
blob
|
history
packages/SystemUI/res/values/strings.xml
patch
|
diff1
|
diff2
|
blob
|
history
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
patch
|
diff1
|
diff2
|
blob
|
history
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/provider/Settings.java
Simple merge
diff --cc
packages/SystemUI/res/values/strings.xml
Simple merge
diff --cc
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
Simple merge
diff --cc
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Simple merge
OSDN Git Service
