OSDN Git Service

Merge remote-tracking branch 'x86/nougat-x86' into cm-14.1-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 22 Oct 2019 09:45:52 +0000 (17:45 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 22 Oct 2019 09:45:52 +0000 (17:45 +0800)
commit5fca2016fee019bfa142e8397f9b269d506abee2
tree84bf3c172fa3a8b4db8413ab1acf391e69646481
parent2aecd541009d1ad4a05b3ac715d5c901e3df5925
parente2bf43a5357457463b33c23ac86a040eac972f15
Merge remote-tracking branch 'x86/nougat-x86' into cm-14.1-x86

Conflicts:
src/com/android/settings/ChooseLockGeneric.java
src/com/android/settings/SettingsActivity.java
src/com/android/settings/bluetooth/BluetoothPairingDialog.java
src/com/android/settings/SettingsActivity.java
src/com/android/settings/bluetooth/BluetoothPairingDialog.java