OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1ee0e67
7fcbaf4
)
Merge "Fix DND crash from SpringboardActivity" into pi-dev am: 3f790b76b0
author
Matthew Fritze
<mfritze@google.com>
Tue, 29 May 2018 19:52:43 +0000
(12:52 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 29 May 2018 19:52:43 +0000
(12:52 -0700)
am:
7fcbaf4ac9
Change-Id: I999288a61ebc780986ed108cd0b255db6ee4d791
1
2
src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/settings/location/LocationSliceBuilder.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/settings/notification/ZenModeSliceBuilder.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/settings/wifi/WifiSliceBuilder.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
Simple merge
diff --cc
src/com/android/settings/location/LocationSliceBuilder.java
Simple merge
diff --cc
src/com/android/settings/notification/ZenModeSliceBuilder.java
Simple merge
diff --cc
src/com/android/settings/wifi/WifiSliceBuilder.java
Simple merge
OSDN Git Service
