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:
c92ac15
b26ecda
)
Merge remote-tracking branch 'cm/cm-14.1' into cm-14.1-x86
cm-14.1-x86
author
Chih-Wei Huang
<cwhuang@linux.org.tw>
Sun, 14 Feb 2021 13:34:12 +0000
(21:34 +0800)
committer
Chih-Wei Huang
<cwhuang@linux.org.tw>
Sun, 14 Feb 2021 13:34:12 +0000
(21:34 +0800)
1
2
src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/settings/SettingsActivity.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/settings/bluetooth/BluetoothPairingDialog.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java
Simple merge
diff --cc
src/com/android/settings/SettingsActivity.java
Simple merge
diff --cc
src/com/android/settings/bluetooth/BluetoothPairingDialog.java
Simple merge
OSDN Git Service
