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:
197ea9e
09da25f
)
Merge "Using zen duration preference" into pi-dev
author
Beverly Tai
<beverlyt@google.com>
Mon, 12 Mar 2018 21:39:18 +0000
(21:39 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Mon, 12 Mar 2018 21:39:18 +0000
(21:39 +0000)
1
2
core/java/android/provider/Settings.java
patch
|
diff1
|
diff2
|
blob
|
history
core/res/res/values/strings.xml
patch
|
diff1
|
diff2
|
blob
|
history
packages/SettingsLib/res/values/strings.xml
patch
|
diff1
|
diff2
|
blob
|
history
proto/src/metrics_constants.proto
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/provider/Settings.java
Simple merge
diff --cc
core/res/res/values/strings.xml
Simple merge
diff --cc
packages/SettingsLib/res/values/strings.xml
Simple merge
diff --cc
proto/src/metrics_constants.proto
Simple merge
OSDN Git Service
