Commits
Naveen Kumar authored d3c166fa5a8M
Merge commit '225b51906b182d635f7abc075e605d9f4f1f5831' into remote Conflicts: core/res/res/values/symbols.xml packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java Change-Id: Ic14c1d1999505b84a444ea5e376604e43624eaac
Showing diff to225b51906b1