OSDN Git Service

Merge "Bluetooth: Use "Disable" in-band ringing instead of "Enable"" am: 80c0656ca6
authorJack He <siyuanh@google.com>
Mon, 8 Jan 2018 20:20:47 +0000 (20:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 8 Jan 2018 20:20:47 +0000 (20:20 +0000)
commitdc9b879ef95063101aa8ae768d5c9a09e51d92d3
tree858d1872f0cb4df323750d211a602680abd4aaf8
parent9dffb28afd2256b7aeafc05f8d70f01349fb30da
parente34375b88c8b84726d41d752d932bb0930240d02
Merge "Bluetooth: Use "Disable" in-band ringing instead of "Enable"" am: 80c0656ca6
am: e34375b88c

Change-Id: Ie9a167aa6310643465238510831eee8cfab34965
res/values/strings.xml
res/xml/development_prefs.xml
src/com/android/settings/development/DevelopmentSettings.java