diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-11-23 06:51:34 +0100 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-11-23 06:51:34 +0100 |
| commit | 45bc4b754b3a89d39caac8f9b58b14182c67ecf6 (patch) | |
| tree | 5c052d202b6c9ce9219b5c97167319677a9889f4 /overlay/frameworks/base/core/res/res/values/config.xml | |
| parent | 8dc38ab89576751c794f2a8a675628f38718f246 (diff) | |
| parent | 214d003a47e7fe2962df667c5d65bce92a21a40e (diff) | |
| download | device_samsung_tuna-45bc4b754b3a89d39caac8f9b58b14182c67ecf6.zip device_samsung_tuna-45bc4b754b3a89d39caac8f9b58b14182c67ecf6.tar.gz device_samsung_tuna-45bc4b754b3a89d39caac8f9b58b14182c67ecf6.tar.bz2 | |
Merge remote-tracking branch 'remotes/google/jb-mr1-release' into HEAD
Conflicts:
audio/audio_hw.c
init.tuna.rc
overlay/frameworks/base/core/res/res/xml/storage_list.xml
recovery/Android.mk
Change-Id: I0b13c6b5e61ea709b0e9aaa1c7b798684b33873a
Diffstat (limited to 'overlay/frameworks/base/core/res/res/values/config.xml')
| -rw-r--r-- | overlay/frameworks/base/core/res/res/values/config.xml | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index c6df363..52cd198 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -213,7 +213,7 @@ bluetooth interfaces. If the device doesn't want to support tethering over bluetooth this should be empty. --> <string-array translatable="false" name="config_tether_bluetooth_regexs"> - <item>"bnep\\d"</item> + <item>"bt-pan"</item> </string-array> <!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering --> @@ -241,12 +241,6 @@ <bool name="config_ui_enableFadingMarquee">false</bool> - <!-- Package name providing network location support. --> - <string name="config_networkLocationProviderPackageName" translatable="false">com.google.android.location</string> - - <!-- Package name providing geocoder API support. --> - <string name="config_geocodeProviderPackageName" translatable="false">com.google.android.location</string> - <!-- Is the notification LED intrusive? Used to decide if there should be a disable option --> <bool name="config_intrusiveNotificationLed">true</bool> |